openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

nfs: drop unnecessary locking in llseek 

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>
Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Andi Kleen 2011-09-15 16:06:52 -07:00 committed by root
parent 4cce0e28b9
commit 79835a710d
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/nfs/file.c
View File

@ -180,8 +180,6 @@ static int nfs_revalidate_file_size(struct inode *inode, struct file *filp)
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);
}
/*