Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: fix fuse_file_lseek returning with lock held

1 files changed, 2 insertions, 1 deletions

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index d9fdb7cec538..821d10f719bd 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -1465,7 +1465,7 @@ static loff_t fuse_file_llseek(struct file *file, loff_t offset, int origin)
         case SEEK_END:
                 retval = fuse_update_attributes(inode, NULL, file, NULL);
                 if (retval)
-                        return retval;
+                        goto exit;
                 offset += i_size_read(inode);
                 break;
         case SEEK_CUR:
@@ -1479,6 +1479,7 @@ static loff_t fuse_file_llseek(struct file *file, loff_t offset, int origin)
                 }
                 retval = offset;
         }
+exit:
         mutex_unlock(&inode->i_mutex);
         return retval;
 }