Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Jan 2011 00:29:04 +0000 (16:29 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Jan 2011 00:29:04 +0000 (16:29 -0800)
commitb06ae1ead2915860bb49331e0588aab326801f71
tree4c4861d2212261223915e80d90f10da1c89e2f72
parente589501cb928b482c3c399444f788e1af35deee2
parent24d9765fc18c7838ccdbb0d71fb706321d9b824c
Merge git://git./linux/kernel/git/steve/gfs2-2.6-fixes

* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
  GFS2: Fix error path in gfs2_lookup_by_inum()
  GFS2: remove iopen glocks from cache on failed deletes