Skip to content

Commit 60d9f50

Browse files
fdmananakdave
authored andcommitted
Btrfs: fix fsync not persisting changed attributes of a directory
While logging an inode we follow its ancestors and for each one we mark it as logged in the current transaction, even if we have not logged it. As a consequence if we change an attribute of an ancestor, such as the UID or GID for example, and then explicitly fsync it, we end up not logging the inode at all despite returning success to user space, which results in the attribute being lost if a power failure happens after the fsync. Sample reproducer: $ mkfs.btrfs -f /dev/sdb $ mount /dev/sdb /mnt $ mkdir /mnt/dir $ chown 6007:6007 /mnt/dir $ sync $ chown 9003:9003 /mnt/dir $ touch /mnt/dir/file $ xfs_io -c fsync /mnt/dir/file # fsync our directory after fsync'ing the new file, should persist the # new values for the uid and gid. $ xfs_io -c fsync /mnt/dir <power failure> $ mount /dev/sdb /mnt $ stat -c %u:%g /mnt/dir 6007:6007 --> should be 9003:9003, the uid and gid were not persisted, despite the explicit fsync on the directory prior to the power failure Fix this by not updating the logged_trans field of ancestor inodes when logging an inode, since we have not logged them. Let only future calls to btrfs_log_inode() to mark inodes as logged. This could be triggered by my recent fsync fuzz tester for fstests, for which an fstests patch exists titled "fstests: generic, fsync fuzz tester with fsstress". Fixes: 12fcfd2 ("Btrfs: tree logging unlink/rename fixes") CC: [email protected] # 4.4+ Signed-off-by: Filipe Manana <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 57949d0 commit 60d9f50

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

fs/btrfs/tree-log.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5478,7 +5478,6 @@ static noinline int check_parent_dirs_for_sync(struct btrfs_trans_handle *trans,
54785478
{
54795479
int ret = 0;
54805480
struct dentry *old_parent = NULL;
5481-
struct btrfs_inode *orig_inode = inode;
54825481

54835482
/*
54845483
* for regular files, if its inode is already on disk, we don't
@@ -5498,16 +5497,6 @@ static noinline int check_parent_dirs_for_sync(struct btrfs_trans_handle *trans,
54985497
}
54995498

55005499
while (1) {
5501-
/*
5502-
* If we are logging a directory then we start with our inode,
5503-
* not our parent's inode, so we need to skip setting the
5504-
* logged_trans so that further down in the log code we don't
5505-
* think this inode has already been logged.
5506-
*/
5507-
if (inode != orig_inode)
5508-
inode->logged_trans = trans->transid;
5509-
smp_mb();
5510-
55115500
if (btrfs_must_commit_transaction(trans, inode)) {
55125501
ret = 1;
55135502
break;
@@ -6384,7 +6373,6 @@ void btrfs_record_unlink_dir(struct btrfs_trans_handle *trans,
63846373
* if this directory was already logged any new
63856374
* names for this file/dir will get recorded
63866375
*/
6387-
smp_mb();
63886376
if (dir->logged_trans == trans->transid)
63896377
return;
63906378

0 commit comments

Comments
 (0)