Commit aaad641e authored by Linus Torvalds's avatar Linus Torvalds

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()
parents 74a7f6a0 9b025eb3
...@@ -131,7 +131,8 @@ xfs_readlink( ...@@ -131,7 +131,8 @@ xfs_readlink(
__func__, (unsigned long long) ip->i_ino, __func__, (unsigned long long) ip->i_ino,
(long long) pathlen); (long long) pathlen);
ASSERT(0); ASSERT(0);
return XFS_ERROR(EFSCORRUPTED); error = XFS_ERROR(EFSCORRUPTED);
goto out;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment