]> git.openfabrics.org - ~shefty/rdma-dev.git/commit
NFS: Fix fcntl F_GETLK not reporting some conflicts
authorSergey Vlasov <vsu@altlinux.ru>
Sun, 28 Nov 2010 21:04:05 +0000 (21:04 +0000)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Wed, 8 Dec 2010 00:30:43 +0000 (19:30 -0500)
commit21ac19d484a8ffb66f64487846c8d53afef04d2b
tree684f635b6d009a05e50499dfec4f7a7f96e0829d
parent08a22b392a141c201d7ed4d435de942aa853acd3
NFS: Fix fcntl F_GETLK not reporting some conflicts

The commit 129a84de2347002f09721cda3155ccfd19fade40 (locks: fix F_GETLK
regression (failure to find conflicts)) fixed the posix_test_lock()
function by itself, however, its usage in NFS changed by the commit
9d6a8c5c213e34c475e72b245a8eb709258e968c (locks: give posix_test_lock
same interface as ->lock) remained broken - subsequent NFS-specific
locking code received F_UNLCK instead of the user-specified lock type.
To fix the problem, fl->fl_type needs to be saved before the
posix_test_lock() call and restored if no local conflicts were reported.

Reference: https://bugzilla.kernel.org/show_bug.cgi?id=23892
Tested-by: Alexander Morozov <amorozov@etersoft.ru>
Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>
Cc: <stable@kernel.org>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
fs/nfs/file.c