A user reported some weird behaviours,
if we move a file with the noCow flag to a directory without the
noCow flag, the file is now without the flag, but after remount,
we'll find the file's noCow flag comes back.

This is because we missed a proper inode update after inheriting
parent directory's flags,

Reported-by: Marios Titas <redneb8...@gmail.com>
Signed-off-by: Liu Bo <bo.li....@oracle.com>
---
 fs/btrfs/inode.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index d9984fa..d2e3352 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -7478,8 +7478,6 @@ static int btrfs_rename(struct inode *old_dir, struct 
dentry *old_dentry,
                                        old_dentry->d_inode,
                                        old_dentry->d_name.name,
                                        old_dentry->d_name.len);
-               if (!ret)
-                       ret = btrfs_update_inode(trans, root, old_inode);
        }
        if (ret) {
                btrfs_abort_transaction(trans, root, ret);
@@ -7514,6 +7512,11 @@ static int btrfs_rename(struct inode *old_dir, struct 
dentry *old_dentry,
        }
 
        fixup_inode_flags(new_dir, old_inode);
+       ret = btrfs_update_inode(trans, root, old_inode);
+       if (ret) {
+               btrfs_abort_transaction(trans, root, ret);
+               goto out_fail;
+       }
 
        ret = btrfs_add_link(trans, new_dir, old_inode,
                             new_dentry->d_name.name,
-- 
1.7.7.6

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to