dect
/
linux-2.6
Archived
13
0
Fork 0

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()
This commit is contained in:
Linus Torvalds 2012-01-25 15:36:44 -08:00
commit aaad641ead
1 changed files with 2 additions and 1 deletions

View File

@ -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;
}