summaryrefslogtreecommitdiff
path: root/fs/efs
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-08-01 00:37:25 (GMT)
committerPaul Mackerras <paulus@samba.org>2006-08-01 00:37:25 (GMT)
commit57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch)
treee9c790afb4286f78cb08d9664f58baa7e876fe55 /fs/efs
parentcb18bd40030c879cd93fef02fd579f74dbab473d (diff)
parent49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff)
downloadlinux-fsl-qoriq-57cad8084e0837e0f2c97da789ec9b3f36809be9.tar.xz
Merge branch 'merge'
Diffstat (limited to 'fs/efs')
-rw-r--r--fs/efs/symlink.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/efs/symlink.c b/fs/efs/symlink.c
index e249cf7..1d30d2f 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);