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()
mariux64 · May 10, 2012 · fda27be · fda27be
2 parents bc46f93 + 48a5730
commit fda27be
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
@@ -699,7 +699,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;