From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Mon, 30 Apr 2012 14:36:21 +0000 (+0300)
Subject: cifs: fix revalidation test in cifs_llseek()
X-Git-Tag: v3.2.19~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6c24eeef039c3fcc0cd81ec4eead2de869eba383;p=thirdparty%2Fkernel%2Fstable.git

cifs: fix revalidation test in cifs_llseek()

commit 48a5730e5b71201e226ff06e245bf308feba5f10 upstream.

This test is always true so it means we revalidate the length every
time, which generates more network traffic.  When it is SEEK_SET or
SEEK_CUR, then we don't need to revalidate.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index b4c2c998acddc..b1451af4a0c28 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -703,7 +703,7 @@ static loff_t cifs_llseek(struct file *file, 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) {
 		int rc;
 		struct inode *inode = file->f_path.dentry->d_inode;