Commit 6c529617 authored Dec 15, 2011 by Trond Myklebust

NFS: Fix a regression in nfs_file_llseek()



After commit 06222e49 (fs: handle
SEEK_HOLE/SEEK_DATA properly in all fs's that define their own llseek)
the behaviour of llseek() was changed so that it always revalidates
the file size. The bug appears to be due to a logic error in the
afore-mentioned commit, which always evaluates to 'true'.

Reported-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: stable@vger.kernel.org [>=3.1]

parent 652f89f6

fs/nfs/file.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -147,7 +147,7 @@ static loff_t nfs_file_llseek(struct file *filp, loff_t offset, int origin)
		* origin == SEEK_END \|\| SEEK_DATA \|\| SEEK_HOLE => we must revalidate
		* the cached file length
		*/
		if (origin != SEEK_SET \|\| origin != SEEK_CUR) {
		if (origin != SEEK_SET && origin != SEEK_CUR) {
		struct inode *inode = filp->f_mapping->host;

		int retval = nfs_revalidate_file_size(inode, filp);

Admin message