lkml.org 
[lkml]   [2011]   [Feb]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 12/23] NFS: Fix fcntl F_GETLK not reporting some conflicts
    2.6.27.58-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Sergey Vlasov <vsu@altlinux.ru>

    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>
    Signed-off-by: Willy Tarreau <w@1wt.eu>

    ---
    fs/nfs/file.c | 2 ++
    1 file changed, 2 insertions(+)

    Index: longterm-2.6.27/fs/nfs/file.c
    ===================================================================
    --- longterm-2.6.27.orig/fs/nfs/file.c 2011-01-29 11:19:14.707063734 +0100
    +++ longterm-2.6.27/fs/nfs/file.c 2011-01-29 11:27:16.154063024 +0100
    @@ -552,6 +552,7 @@
    {
    struct inode *inode = filp->f_mapping->host;
    int status = 0;
    + unsigned int saved_type = fl->fl_type;

    lock_kernel();
    /* Try local locking first */
    @@ -560,6 +561,7 @@
    /* found a conflict */
    goto out;
    }
    + fl->fl_type = saved_type;

    if (nfs_have_delegation(inode, FMODE_READ))
    goto out_noconflict;



    \
     
     \ /
      Last update: 2011-02-07 00:51    [W:0.026 / U:59.108 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site