aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-25 15:36:44 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-25 15:36:44 -0800
commitaaad641eadfd3e74b0fbb68fcf539b9cef0415d0 (patch)
treed8b8a65b84e3c2be1b697f205c75dd970538aef2 /fs
parent74a7f6a0a61f1f5addd0afa789785f4cefcfcafc (diff)
parent9b025eb3a89e041bab6698e3858706be2385d692 (diff)
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
Quoth Ben Myers: "Please pull in the following bugfix for xfs. We forgot to drop a lock on error in xfs_readlink. It hasn't been through -next yet, but there is no -next tree tomorrow. The fix is clear so I'm sending this request today." * 'for-linus' of git://oss.sgi.com/xfs/xfs: xfs: Fix missing xfs_iunlock() on error recovery path in xfs_readlink()
Diffstat (limited to 'fs')
-rw-r--r--fs/xfs/xfs_vnodeops.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c
index 0cf52da9d246..ebdb88840a47 100644
--- a/fs/xfs/xfs_vnodeops.c
+++ b/fs/xfs/xfs_vnodeops.c
@@ -131,7 +131,8 @@ xfs_readlink(
__func__, (unsigned long long) ip->i_ino,
(long long) pathlen);
ASSERT(0);
- return XFS_ERROR(EFSCORRUPTED);
+ error = XFS_ERROR(EFSCORRUPTED);
+ goto out;
}

Privacy Policy