[lkml]   [2011]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Patch in this message
    Subject[019/152] NFS: Fix fcntl F_GETLK not reporting some conflicts
    2.6.36-stable review patch.  If anyone has any objections, please let us know.


    From: Sergey Vlasov <>

    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.

    Tested-by: Alexander Morozov <>
    Signed-off-by: Sergey Vlasov <>
    Signed-off-by: Trond Myklebust <>
    Signed-off-by: Greg Kroah-Hartman <>

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

    --- a/fs/nfs/file.c
    +++ b/fs/nfs/file.c
    @@ -687,6 +687,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);
    @@ -694,6 +695,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;

     \ /
      Last update: 2011-01-06 01:33    [W:0.020 / U:10.368 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site