diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-28 13:27:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-28 13:27:15 -0700 |
| commit | e547204f1f4f314a7352f7b93332fdc1a2e4b24c (patch) | |
| tree | 2a6d1cdd9224b4a402f479c8d3b25944ae0a111e /fs/nfs/callback_xdr.c | |
| parent | 5a37be4b51bbf85e37cdb5831899c330505faf03 (diff) | |
| parent | 2e31b4cb895ae78db31dffb860cd255d86c6561c (diff) | |
| download | linux-e547204f1f4f314a7352f7b93332fdc1a2e4b24c.tar.gz linux-e547204f1f4f314a7352f7b93332fdc1a2e4b24c.tar.bz2 linux-e547204f1f4f314a7352f7b93332fdc1a2e4b24c.zip | |
Merge tag 'nfs-for-4.12-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
Pull NFS client bugfixes from Trond Myklebust:
"Bugfixes include:
- stable fix for exclusive create if the server supports the umask
attribute
- trunking detection should handle ERESTARTSYS/EINTR
- stable fix for a race in the LAYOUTGET function
- stable fix to revert "nfs_rename() handle -ERESTARTSYS dentry left
behind"
- nfs4_callback_free_slot() cannot call nfs4_slot_tbl_drain_complete()"
* tag 'nfs-for-4.12-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
NFSv4.1: nfs4_callback_free_slot() cannot call nfs4_slot_tbl_drain_complete()
Revert "NFS: nfs_rename() handle -ERESTARTSYS dentry left behind"
NFSv4.1: Fix a race in nfs4_proc_layoutget
NFS: Trunking detection should handle ERESTARTSYS/EINTR
NFSv4.2: Don't send mode again in post-EXCLUSIVE4_1 SETATTR with umask
Diffstat (limited to 'fs/nfs/callback_xdr.c')
| -rw-r--r-- | fs/nfs/callback_xdr.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c index c14758e08d73..390ac9c39c59 100644 --- a/fs/nfs/callback_xdr.c +++ b/fs/nfs/callback_xdr.c @@ -753,7 +753,6 @@ static void nfs4_callback_free_slot(struct nfs4_session *session, * A single slot, so highest used slotid is either 0 or -1 */ nfs4_free_slot(tbl, slot); - nfs4_slot_tbl_drain_complete(tbl); spin_unlock(&tbl->slot_tbl_lock); } |