Merge tag 'nfs-for-3.9-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
Pull NFS client bugfixes from Trond Myklebust: - Fix an Oops in the pNFS layoutget code - Fix a number of NFSv4 and v4.1 state recovery deadlocks and hangs due to the interaction of the session drain lock and state management locks. - Remove task->tk_xprt, which was hiding a lot of RCU dereferencing bugs - Fix a long standing NFSv3 posix lock recovery bug. - Revert commit 324d003b ("NFS: add nfs_sb_deactive_async to avoid deadlock"). It turned out that the root cause of the deadlock was due to interactions with the workqueues that have now been resolved. * tag 'nfs-for-3.9-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (22 commits) NLM: Ensure that we resend all pending blocking locks after a reclaim umount oops when remove blocklayoutdriver first sunrpc: silence build warning in gss_fill_context nfs: remove kfree() redundant null checks NFSv4.1: Don't decode skipped layoutgets NFSv4.1: Fix bulk recall and destroy of layouts NFSv4.1: Fix an ABBA locking issue with session and state serialisation NFSv4: Fix a reboot recovery race when opening a file NFSv4: Ensure delegation recall and byte range lock removal don't conflict NFSv4: Fix up the return values of nfs4_open_delegation_recall NFSv4.1: Don't lose locks when a server reboots during delegation return NFSv4.1: Prevent deadlocks between state recovery and file locking NFSv4: Allow the state manager to mark an open_owner as being recovered SUNRPC: Add missing static declaration to _gss_mech_get_by_name Revert "NFS: add nfs_sb_deactive_async to avoid deadlock" SUNRPC: Nuke the tk_xprt macro SUNRPC: Avoid RCU dereferences in the transport bind and connect code SUNRPC: Fix an RCU dereference in xprt_reserve SUNRPC: Pass pointers to struct rpc_xprt to the congestion window SUNRPC: Fix an RCU dereference in xs_local_rpcbind ...
Showing
- fs/lockd/clntproc.c 3 additions, 0 deletionsfs/lockd/clntproc.c
- fs/nfs/blocklayout/blocklayout.c 1 addition, 0 deletionsfs/nfs/blocklayout/blocklayout.c
- fs/nfs/callback_proc.c 8 additions, 53 deletionsfs/nfs/callback_proc.c
- fs/nfs/delegation.c 110 additions, 44 deletionsfs/nfs/delegation.c
- fs/nfs/delegation.h 1 addition, 0 deletionsfs/nfs/delegation.h
- fs/nfs/getroot.c 1 addition, 2 deletionsfs/nfs/getroot.c
- fs/nfs/inode.c 1 addition, 4 deletionsfs/nfs/inode.c
- fs/nfs/internal.h 0 additions, 1 deletionfs/nfs/internal.h
- fs/nfs/nfs4_fs.h 4 additions, 0 deletionsfs/nfs/nfs4_fs.h
- fs/nfs/nfs4proc.c 92 additions, 41 deletionsfs/nfs/nfs4proc.c
- fs/nfs/nfs4state.c 10 additions, 1 deletionfs/nfs/nfs4state.c
- fs/nfs/objlayout/objio_osd.c 1 addition, 0 deletionsfs/nfs/objlayout/objio_osd.c
- fs/nfs/pnfs.c 130 additions, 20 deletionsfs/nfs/pnfs.c
- fs/nfs/pnfs.h 6 additions, 1 deletionfs/nfs/pnfs.h
- fs/nfs/super.c 0 additions, 49 deletionsfs/nfs/super.c
- fs/nfs/unlink.c 2 additions, 3 deletionsfs/nfs/unlink.c
- include/linux/sunrpc/sched.h 0 additions, 1 deletioninclude/linux/sunrpc/sched.h
- include/linux/sunrpc/xprt.h 3 additions, 3 deletionsinclude/linux/sunrpc/xprt.h
- net/sunrpc/auth_gss/auth_gss.c 2 additions, 3 deletionsnet/sunrpc/auth_gss/auth_gss.c
- net/sunrpc/auth_gss/gss_mech_switch.c 2 additions, 2 deletionsnet/sunrpc/auth_gss/gss_mech_switch.c
Loading
Please register or sign in to comment