Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79835a71 authored by Andi Kleen's avatar Andi Kleen Committed by root
Browse files

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: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 4cce0e28

fs/nfs/file.c

+2 −9
Original line number Diff line number Diff line
@@ -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);

}



/*