xattr support for btrfs

Signed-off-by: Chris Mason <chris.mason@oracle.com>

diff --cc fs/btrfs/Makefile
Simple merge

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

diff --cc fs/btrfs/ctree.h
Simple merge

diff --cc fs/btrfs/dir-item.c
Simple merge

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

diff --cc fs/btrfs/print-tree.c
Simple merge

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

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

diff --cc fs/btrfs/xattr.h
Simple merge