Btrfs: Add ACL support
authorJosef Bacik <jbacik@redhat.com>
Thu, 24 Jul 2008 16:16:36 +0000 (12:16 -0400)
committerChris Mason <chris.mason@oracle.com>
Thu, 25 Sep 2008 15:04:05 +0000 (11:04 -0400)
Signed-off-by: Chris Mason <chris.mason@oracle.com>
fs/btrfs/acl.c
fs/btrfs/btrfs_inode.h
fs/btrfs/ctree.h
fs/btrfs/inode.c
fs/btrfs/super.c
fs/btrfs/xattr.c

diff --cc fs/btrfs/acl.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge