diff --git a/[refs] b/[refs]
index 41ec70f74651..4a748b00afd6 100644
--- 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
index eca56d4b39c0..606ef0f20aed 100644
--- 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);