Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: NFS: NFSROOT should default to "proto=udp" nfs4: remove duplicated #include NFSv4: nfs4_state_mark_reclaim_nograce() should be static NFSv4: Fix the setlk error handler NFSv4.1: Fix the handling of the SEQUENCE status bits NFSv4/4.1: Fix nfs4_schedule_state_recovery abuses NFSv4.1 reclaim complete must wait for completion NFSv4: remove duplicate clientid in struct nfs_client NFSv4.1: Retry CREATE_SESSION on NFS4ERR_DELAY sunrpc: Propagate errors from xs_bind() through xs_create_sock() (try3-resend) Fix nfs_compat_user_ino64 so it doesn't cause problems if bit 31 or 63 are set in fileid nfs: fix compilation warning nfs: add kmalloc return value check in decode_and_add_ds SUNRPC: Remove resource leak in svc_rdma_send_error() nfs: close NFSv4 COMMIT vs. CLOSE race SUNRPC: Close a race in __rpc_wait_for_completion_task()
Showing
- fs/nfs/inode.c 6 additions, 1 deletionfs/nfs/inode.c
- fs/nfs/nfs4_fs.h 7 additions, 3 deletionsfs/nfs/nfs4_fs.h
- fs/nfs/nfs4filelayoutdev.c 4 additions, 0 deletionsfs/nfs/nfs4filelayoutdev.c
- fs/nfs/nfs4proc.c 52 additions, 39 deletionsfs/nfs/nfs4proc.c
- fs/nfs/nfs4state.c 21 additions, 8 deletionsfs/nfs/nfs4state.c
- fs/nfs/nfs4xdr.c 2 additions, 2 deletionsfs/nfs/nfs4xdr.c
- fs/nfs/nfsroot.c 14 additions, 15 deletionsfs/nfs/nfsroot.c
- fs/nfs/unlink.c 1 addition, 1 deletionfs/nfs/unlink.c
- fs/nfs/write.c 2 additions, 0 deletionsfs/nfs/write.c
- include/linux/nfs_fs_sb.h 3 additions, 7 deletionsinclude/linux/nfs_fs_sb.h
- include/linux/sunrpc/sched.h 1 addition, 0 deletionsinclude/linux/sunrpc/sched.h
- kernel/sched.c 1 addition, 0 deletionskernel/sched.c
- net/sunrpc/sched.c 61 additions, 14 deletionsnet/sunrpc/sched.c
- net/sunrpc/xprtrdma/svc_rdma_transport.c 1 addition, 0 deletionsnet/sunrpc/xprtrdma/svc_rdma_transport.c
- net/sunrpc/xprtsock.c 2 additions, 1 deletionnet/sunrpc/xprtsock.c
Loading
Please register or sign in to comment