From 587619f23b9a02df436f0be28390b5a7f7c9b37f Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <mszeredi@suse.cz>
Date: Tue, 13 Dec 2011 11:40:59 +0100
Subject: [PATCH] --- yaml --- r: 276655 b: refs/heads/master c:
 73104b6e37f75f822e3dcf016147c322d1f6dad9 h: refs/heads/master i:   276653:
 c83c2403458f32960a303d005171ac137ba33b06   276651:
 7672487ad24a5a5065e7f6db7315763889bc1221   276647:
 90b201491d38930de20bb7d87c1c70034aba7ade   276639:
 db1267e0f63d434e1aac359056e6950c307ca271 v: v3

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

diff --git a/[refs] b/[refs]
index a2f355bbaf05..e4e98de969fa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b48c6af2086ab2ba8a9c9b6ce9ecb34592ce500c
+refs/heads/master: 73104b6e37f75f822e3dcf016147c322d1f6dad9
diff --git a/trunk/fs/fuse/file.c b/trunk/fs/fuse/file.c
index 19029e97ca2f..0c84100acd44 100644
--- a/trunk/fs/fuse/file.c
+++ b/trunk/fs/fuse/file.c
@@ -1567,6 +1567,10 @@ static loff_t fuse_file_llseek(struct file *file, loff_t offset, int origin)
 		offset += i_size_read(inode);
 		break;
 	case SEEK_CUR:
+		if (offset == 0) {
+			retval = file->f_pos;
+			goto exit;
+		}
 		offset += file->f_pos;
 		break;
 	case SEEK_DATA: