2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------ From: Sergey Vlasov <[email protected]> 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 <[email protected]> Signed-off-by: Sergey Vlasov <[email protected]> Signed-off-by: Trond Myklebust <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Andi Kleen <[email protected]> --- fs/nfs/file.c | 2 ++ 1 file changed, 2 insertions(+) Index: linux-2.6.35.y/fs/nfs/file.c =================================================================== --- linux-2.6.35.y.orig/fs/nfs/file.c +++ linux-2.6.35.y/fs/nfs/file.c @@ -696,6 +696,7 @@ static int do_getlk(struct file *filp, i { struct inode *inode = filp->f_mapping->host; int status = 0; + unsigned int saved_type = fl->fl_type; /* Try local locking first */ posix_test_lock(filp, fl); @@ -703,6 +704,7 @@ static int do_getlk(struct file *filp, i /* found a conflict */ goto out; } + fl->fl_type = saved_type; if (nfs_have_delegation(inode, FMODE_READ)) goto out_noconflict; _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
