Merge branch 'for-2.6.29' of git://linux-nfs.org/~bfields/linux

Browse source

* 'for-2.6.29' of git://linux-nfs.org/~bfields/linux:
  nfsd: only set file_lock.fl_lmops in nfsd4_lockt if a stateowner is found
  nfsd: fix cred leak on every rpc
  nfsd: fix null dereference on error path
  nfs: note that CONFIG_SUNRPC_XPRT_RDMA turns on server side support too
  update port number in NFS/RDMA documentation

...

This commit is contained in:

Linus Torvalds 2009-01-27 16:07:44 -08:00

parent b00ecabf1d fa82a49127

commit 843c04a0f6

4 changed files with 7 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

Documentation/filesystems/nfs-rdma.txt

View file

3

fs/nfsd/auth.c

View file

1

fs/nfsd/nfs4state.c

View file

5

net/sunrpc/Kconfig

View file