]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit739ce9d7607af359e61d762a351b45a2e77add64
tree41d2e7784f57212a3f910690e00dcd1707a7e47f
parent7b316a6259ec64d6f56b5a56c0787f5e2ed070fe
parenta7853bf32c785137e48bee79afd8efe7c456f085
Merge git://git.kernel.org/pub/scm/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