From 3226f0d96a5d03e5b8d5ea08e381aeaea15111b2 Mon Sep 17 00:00:00 2001
From: Roel Kluin <roel.kluin@gmail.com>
Date: Tue, 13 Dec 2011 10:37:00 +0100
Subject: [PATCH] --- yaml --- r: 276654 b: refs/heads/master c:
 b48c6af2086ab2ba8a9c9b6ce9ecb34592ce500c h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 95eeb6a55fee..a2f355bbaf05 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48706d0a91583d08c56e7ef2a7602d99c8d4133f
+refs/heads/master: b48c6af2086ab2ba8a9c9b6ce9ecb34592ce500c
diff --git a/trunk/fs/fuse/file.c b/trunk/fs/fuse/file.c
index 594f07a81c28..19029e97ca2f 100644
--- a/trunk/fs/fuse/file.c
+++ b/trunk/fs/fuse/file.c
@@ -1556,7 +1556,7 @@ static loff_t fuse_file_llseek(struct file *file, loff_t offset, int origin)
 	struct inode *inode = file->f_path.dentry->d_inode;
 
 	mutex_lock(&inode->i_mutex);
-	if (origin != SEEK_CUR || origin != SEEK_SET) {
+	if (origin != SEEK_CUR && origin != SEEK_SET) {
 		retval = fuse_update_attributes(inode, NULL, file, NULL);
 		if (retval)
 			goto exit;