]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Jan 2012 23:36:44 +0000 (15:36 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Jan 2012 23:36:44 +0000 (15:36 -0800)
commit48b321c88dc27b59204cb392d7cad7c58ba0ec16
treed8b8a65b84e3c2be1b697f205c75dd970538aef2
parent64d0c4fc88a8882fdb25f91783bf81fe366d66ad
parent4c2c044542ee54aabde7e499a56cb0646931d2c1
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()