Merge tag 'kvm-5.6-2' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[linux.git] / fs / btrfs / acl.c

diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
index 5810463dc6d210b274d85e8a8819f7579fcf4dbc..a0af1b952c4df1c996c6a92da149d818d3b3eac6 100644 (file)
--- a/fs/btrfs/acl.c
+++ b/fs/btrfs/acl.c
@@ -93,7 +93,11 @@ static int __btrfs_set_acl(struct btrfs_trans_handle *trans,
                        goto out;
        }
 
-       ret = btrfs_setxattr(trans, inode, name, value, size, 0);
+       if (trans)
+               ret = btrfs_setxattr(trans, inode, name, value, size, 0);
+       else
+               ret = btrfs_setxattr_trans(inode, name, value, size, 0);
+
 out:
        kfree(value);