lkml.org 
[lkml]   [2011]   [Sep]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6/7] LSEEK: NFS: Drop unnecessary locking in llseek
    Date
    From: Andi Kleen <ak@linux.intel.com>

    This makes NFS follow the standard generic_file_llseek locking scheme.

    Cc: Trond.Myklebust@netapp.com
    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    ---
    fs/nfs/file.c | 11 ++---------
    1 files changed, 2 insertions(+), 9 deletions(-)

    diff --git a/fs/nfs/file.c b/fs/nfs/file.c
    index 12623ab..91c01f0 100644
    --- a/fs/nfs/file.c
    +++ b/fs/nfs/file.c
    @@ -180,8 +180,6 @@ force_reval:

    static loff_t nfs_file_llseek(struct file *filp, loff_t offset, int origin)
    {
    - loff_t loff;
    -
    dprintk("NFS: llseek file(%s/%s, %lld, %d)\n",
    filp->f_path.dentry->d_parent->d_name.name,
    filp->f_path.dentry->d_name.name,
    @@ -197,14 +195,9 @@ static loff_t nfs_file_llseek(struct file *filp, loff_t offset, int origin)
    int retval = nfs_revalidate_file_size(inode, filp);
    if (retval < 0)
    return (loff_t)retval;
    + }

    - /* AK: should drop this lock. Unlikely to be needed. */
    - spin_lock(&inode->i_lock);
    - loff = generic_file_llseek(filp, offset, origin);
    - spin_unlock(&inode->i_lock);
    - } else
    - loff = generic_file_llseek(filp, offset, origin);
    - return loff;
    + return generic_file_llseek(filp, offset, origin);
    }

    /*
    --
    1.7.4.4


    \
     
     \ /
      Last update: 2011-09-16 01:11    [W:0.022 / U:0.416 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site