Merge tag 'fs_for_v5.2-rc1' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / fs / btrfs / acl.c

diff --git a/fs/btrfs/acl.c b/fs/btrfs/acl.c
index 5810463..a0af1b9 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);