---

yaml --- r: 276895 b: refs/heads/master c: 6c52961 h: refs/heads/master i: 276893: 7aff875 276891: a459493 276887: 298f2a9 276879: 9184f49 276863: 33bb4e4 v: v3
git-mirror · Dec 15, 2011 · aed12de · aed12de
1 parent a425fa3
commit aed12de
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 652f89f64fabcdae9143ee2b4253cfa838fb0279
+refs/heads/master: 6c52961743f38747401b47127b82159ab6d8a7a4
diff --git a/trunk/fs/nfs/file.c b/trunk/fs/nfs/file.c
@@ -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);