Commit 53846a21c1766326bb14ce8ab6e997a0c120675d
Exists in
master
and in
39 other branches
Merge git://git.linux-nfs.org/pub/linux/nfs-2.6
* git://git.linux-nfs.org/pub/linux/nfs-2.6: (103 commits) SUNRPC,RPCSEC_GSS: spkm3--fix config dependencies SUNRPC,RPCSEC_GSS: spkm3: import contexts using NID_cast5_cbc LOCKD: Make nlmsvc_traverse_shares return void LOCKD: nlmsvc_traverse_blocks return is unused SUNRPC,RPCSEC_GSS: fix krb5 sequence numbers. NFSv4: Dont list system.nfs4_acl for filesystems that don't support it. SUNRPC,RPCSEC_GSS: remove unnecessary kmalloc of a checksum SUNRPC: Ensure rpc_call_async() always calls tk_ops->rpc_release() SUNRPC: Fix memory barriers for req->rq_received NFS: Fix a race in nfs_sync_inode() NFS: Clean up nfs_flush_list() NFS: Fix a race with PG_private and nfs_release_page() NFSv4: Ensure the callback daemon flushes signals SUNRPC: Fix a 'Busy inodes' error in rpc_pipefs NFS, NLM: Allow blocking locks to respect signals NFS: Make nfs_fhget() return appropriate error values NFSv4: Fix an oops in nfs4_fill_super lockd: blocks should hold a reference to the nlm_file NFSv4: SETCLIENTID_CONFIRM should handle NFS4ERR_DELAY/NFS4ERR_RESOURCE NFSv4: Send the delegation stateid for SETATTR calls ...
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
If you still want to see the diff click this link
Showing 69 changed files Side-by-side Diff
- fs/Kconfig
- fs/lockd/clntlock.c
- fs/lockd/clntproc.c
- fs/lockd/host.c
- fs/lockd/mon.c
- fs/lockd/svc4proc.c
- fs/lockd/svclock.c
- fs/lockd/svcproc.c
- fs/lockd/svcshare.c
- fs/lockd/svcsubs.c
- fs/lockd/xdr.c
- fs/lockd/xdr4.c
- fs/locks.c
- fs/namespace.c
- fs/nfs/callback.c
- fs/nfs/callback_xdr.c
- fs/nfs/delegation.c
- fs/nfs/delegation.h
- fs/nfs/dir.c
- fs/nfs/direct.c
- fs/nfs/file.c
- fs/nfs/idmap.c
- fs/nfs/inode.c
- fs/nfs/iostat.h
- fs/nfs/mount_clnt.c
- fs/nfs/nfs2xdr.c
- fs/nfs/nfs3acl.c
- fs/nfs/nfs3proc.c
- fs/nfs/nfs3xdr.c
- fs/nfs/nfs4proc.c
- fs/nfs/nfs4state.c
- fs/nfs/nfs4xdr.c
- fs/nfs/pagelist.c
- fs/nfs/proc.c
- fs/nfs/read.c
- fs/nfs/unlink.c
- fs/nfs/write.c
- fs/nfsd/nfs4callback.c
- fs/nfsd/nfs4state.c
- fs/proc/base.c
- include/linux/fs.h
- include/linux/lockd/lockd.h
- include/linux/lockd/share.h
- include/linux/lockd/xdr.h
- include/linux/nfs_fs.h
- include/linux/nfs_fs_i.h
- include/linux/nfs_fs_sb.h
- include/linux/nfs_xdr.h
- include/linux/sunrpc/clnt.h
- include/linux/sunrpc/gss_krb5.h
- include/linux/sunrpc/metrics.h
- include/linux/sunrpc/rpc_pipe_fs.h
- include/linux/sunrpc/sched.h
- include/linux/sunrpc/xprt.h
- net/sunrpc/auth.c
- net/sunrpc/auth_gss/auth_gss.c
- net/sunrpc/auth_gss/gss_krb5_seal.c
- net/sunrpc/auth_gss/gss_krb5_unseal.c
- net/sunrpc/auth_gss/gss_krb5_wrap.c
- net/sunrpc/auth_gss/gss_spkm3_mech.c
- net/sunrpc/auth_gss/gss_spkm3_seal.c
- net/sunrpc/auth_gss/gss_spkm3_unseal.c
- net/sunrpc/clnt.c
- net/sunrpc/pmap_clnt.c
- net/sunrpc/rpc_pipe.c
- net/sunrpc/sched.c
- net/sunrpc/stats.c
- net/sunrpc/xprt.c
- net/sunrpc/xprtsock.c