From aed12de692deabb7c670b8b31a073e95fa1d00d2 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Thu, 15 Dec 2011 18:38:10 -0500
Subject: [PATCH] --- yaml --- r: 276895 b: refs/heads/master c:
 6c52961743f38747401b47127b82159ab6d8a7a4 h: refs/heads/master i:   276893:
 7aff87553040a30402c2961b807167fb553db47d   276891:
 a459493fe022aa13fde725df5881a1e2de8e2687   276887:
 298f2a9b6f720daf94df9a5ec1224235fb5a2f22   276879:
 9184f490e6c8c2e7ea185c50e0d9d4a97482197d   276863:
 33bb4e426d9d14ecd945ce626d9682499aae69b9 v: v3

---
 [refs]              | 2 +-
 trunk/fs/nfs/file.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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);