diff options
author | Sergey Vlasov <vsu@altlinux.ru> | 2010-11-28 21:04:05 +0000 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-21 12:44:22 -0700 |
commit | 8ca4ba7bac89a78cc75de8b47872030bfb9faee6 (patch) | |
tree | 7d1b4982c0336a609f24cff10f832d7be180ed49 /fs/dlm/Kconfig | |
parent | 8db3fab78db195b013c42fbaf9267ef0875b1b3f (diff) |
NFS: Fix fcntl F_GETLK not reporting some conflicts
commit 21ac19d484a8ffb66f64487846c8d53afef04d2b upstream.
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>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs/dlm/Kconfig')
0 files changed, 0 insertions, 0 deletions