From 52472af2370958c613ad1d2e439e0ae0ad192810 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Tue, 13 Dec 2011 09:19:26 -0800
Subject: [PATCH] --- yaml --- r: 276640 b: refs/heads/master c:
 6a82c47aa84ab22cb5969a44105cca5358879d21 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index dba519614f94..ccf379e9fcd0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1932fc1a6d899c754676b1dd8b17de93b052d43
+refs/heads/master: 6a82c47aa84ab22cb5969a44105cca5358879d21
diff --git a/trunk/fs/ceph/file.c b/trunk/fs/ceph/file.c
index af187330cc89..ed72428d9c75 100644
--- a/trunk/fs/ceph/file.c
+++ b/trunk/fs/ceph/file.c
@@ -797,7 +797,8 @@ static loff_t ceph_llseek(struct file *file, loff_t offset, int origin)
 
 	mutex_lock(&inode->i_mutex);
 	__ceph_do_pending_vmtruncate(inode);
-	if (origin != SEEK_CUR || origin != SEEK_SET) {
+
+	if (origin == SEEK_END || origin == SEEK_DATA || origin == SEEK_HOLE) {
 		ret = ceph_do_getattr(inode, CEPH_STAT_CAP_SIZE);
 		if (ret < 0) {
 			offset = ret;