Merge branch 'for-linus' of git://

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://
  xfs: Fix missing xfs_iunlock() on error recovery path in xfs_readlink()