Merge branch btrfs-master into for-linus

Conflicts:
	fs/btrfs/acl.c

diff --cc fs/btrfs/acl.c
index 52cbe47,1898f85..2e9e699
--- 1/fs/btrfs/acl.c
--- 2/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
@@@ -151,10 -151,10 +151,10 @@@ out
        return ret;
  }
  
 -static int btrfs_xattr_set_acl(struct inode *inode, int type,
 -                             const void *value, size_t size)
 +static int btrfs_xattr_acl_set(struct dentry *dentry, const char *name,
 +              const void *value, size_t size, int flags, int type)
  {
-       int ret = 0;
+       int ret;
        struct posix_acl *acl = NULL;
  
        if (value) {
@@@ -167,7 -167,7 +167,7 @@@
                }
        }
  
-       ret = btrfs_set_acl(dentry->d_inode, acl, type);
 -      ret = btrfs_set_acl(NULL, inode, acl, type);
++      ret = btrfs_set_acl(NULL, dentry->d_inode, acl, type);
  
        posix_acl_release(acl);
  

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