Merge tag 'v5.2-rc6' into sched/core, to refresh the branch

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c
index 78b6ba2029e8..95d9aebff2c4 100644
--- a/fs/btrfs/xattr.c
+++ b/fs/btrfs/xattr.c
@@ -213,6 +213,9 @@ int btrfs_setxattr(struct btrfs_trans_handle *trans, struct inode *inode,
         }
 out:
         btrfs_free_path(path);
+        if (!ret)
+                set_bit(BTRFS_INODE_COPY_EVERYTHING,
+                        &BTRFS_I(inode)->runtime_flags);
         return ret;
 }
 
@@ -236,7 +239,6 @@ int btrfs_setxattr_trans(struct inode *inode, const char *name,
 
         inode_inc_iversion(inode);
         inode->i_ctime = current_time(inode);
-        set_bit(BTRFS_INODE_COPY_EVERYTHING, &BTRFS_I(inode)->runtime_flags);
         ret = btrfs_update_inode(trans, root, inode);
         BUG_ON(ret);
 out:
@@ -388,8 +390,6 @@ static int btrfs_xattr_handler_set_prop(const struct xattr_handler *handler,
         if (!ret) {
                 inode_inc_iversion(inode);
                 inode->i_ctime = current_time(inode);
-                set_bit(BTRFS_INODE_COPY_EVERYTHING,
-                        &BTRFS_I(inode)->runtime_flags);
                 ret = btrfs_update_inode(trans, root, inode);
                 BUG_ON(ret);
         }