commit fda27bed908bb8c1c9bdaceb6b49bc6b21fc5424
author Linus Torvalds <torvalds@linux-foundation.org> Thu May 10 14:59:02 2012 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Thu May 10 14:59:02 2012 -0700
tree 0c0ced4790e6efcddeff04154bc8f7a9fbe80fc0
parent bc46f9375a286d05f84a9464efc2b7f1f5614ff4
parent 48a5730e5b71201e226ff06e245bf308feba5f10

Merge git://git.samba.org/sfrench/cifs-2.6

Pull cifs fix from Steve French.

* git://git.samba.org/sfrench/cifs-2.6:
  cifs: fix revalidation test in cifs_llseek()

fs/cifs/cifsfs.c

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index ca6a379..541ef81 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -699,7 +699,7 @@
 	 * 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;