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: