Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 May 2010 15:17:51 +0000 (08:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 May 2010 15:17:51 +0000 (08:17 -0700)
commitf16a5e347835c6a0ba958535cf6e6c89d50463b8
tree41d2e7784f57212a3f910690e00dcd1707a7e47f
parent110b93842e36b17598cf24874e90d0401431cda2
parent7df0e0397b9a18358573274db9fdab991941062f
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 permissions checking for setflags ioctl()
  GFS2: Don't "get" xattrs for ACLs when ACLs are turned off
  GFS2: Rework reclaiming unlinked dinodes
fs/gfs2/acl.c
fs/gfs2/rgrp.c