Merge ../linus

1 files changed, 2 insertions, 1 deletions

diff --git a/fs/efs/symlink.c b/fs/efs/symlink.c
index e249cf733a6b..1d30d2ff440f 100644
--- a/fs/efs/symlink.c
+++ b/fs/efs/symlink.c
@@ -22,7 +22,7 @@ static int efs_symlink_readpage(struct file *file, struct page *page)
   
         err = -ENAMETOOLONG;
         if (size > 2 * EFS_BLOCKSIZE)
-                goto fail;
+                goto fail_notlocked;
   
         lock_kernel();
         /* read first 512 bytes of link target */
@@ -47,6 +47,7 @@ static int efs_symlink_readpage(struct file *file, struct page *page)
         return 0;
 fail:
         unlock_kernel();
+fail_notlocked:
         SetPageError(page);
         kunmap(page);
         unlock_page(page);