Conflicts:
	fs/btrfs/inode.c
	fs/btrfs/ioctl.c
	fs/btrfs/transaction.c
Signed-off-by: NChris Mason <chris.mason@oracle.com>