Skip to content

Commit 803f0f6

Browse files
fdmananakdave
authored andcommitted
Btrfs: fix fsync not persisting dentry deletions due to inode evictions
In order to avoid searches on a log tree when unlinking an inode, we check if the inode being unlinked was logged in the current transaction, as well as the inode of its parent directory. When any of the inodes are logged, we proceed to delete directory items and inode reference items from the log, to ensure that if a subsequent fsync of only the inode being unlinked or only of the parent directory when the other is not fsync'ed as well, does not result in the entry still existing after a power failure. That check however is not reliable when one of the inodes involved (the one being unlinked or its parent directory's inode) is evicted, since the logged_trans field is transient, that is, it is not stored on disk, so it is lost when the inode is evicted and loaded into memory again (which is set to zero on load). As a consequence the checks currently being done by btrfs_del_dir_entries_in_log() and btrfs_del_inode_ref_in_log() always return true if the inode was evicted before, regardless of the inode having been logged or not before (and in the current transaction), this results in the dentry being unlinked still existing after a log replay if after the unlink operation only one of the inodes involved is fsync'ed. Example: $ mkfs.btrfs -f /dev/sdb $ mount /dev/sdb /mnt $ mkdir /mnt/dir $ touch /mnt/dir/foo $ xfs_io -c fsync /mnt/dir/foo # Keep an open file descriptor on our directory while we evict inodes. # We just want to evict the file's inode, the directory's inode must not # be evicted. $ ( cd /mnt/dir; while true; do :; done ) & $ pid=$! # Wait a bit to give time to background process to chdir to our test # directory. $ sleep 0.5 # Trigger eviction of the file's inode. $ echo 2 > /proc/sys/vm/drop_caches # Unlink our file and fsync the parent directory. After a power failure # we don't expect to see the file anymore, since we fsync'ed the parent # directory. $ rm -f $SCRATCH_MNT/dir/foo $ xfs_io -c fsync /mnt/dir <power failure> $ mount /dev/sdb /mnt $ ls /mnt/dir foo $ --> file still there, unlink not persisted despite explicit fsync on dir Fix this by checking if the inode has the full_sync bit set in its runtime flags as well, since that bit is set everytime an inode is loaded from disk, or for other less common cases such as after a shrinking truncate or failure to allocate extent maps for holes, and gets cleared after the first fsync. Also consider the inode as possibly logged only if it was last modified in the current transaction (besides having the full_fsync flag set). Fixes: 3a5f1d4 ("Btrfs: Optimize btree walking while logging inodes") CC: [email protected] # 4.4+ Signed-off-by: Filipe Manana <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 89b798a commit 803f0f6

File tree

1 file changed

+26
-2
lines changed

1 file changed

+26
-2
lines changed

fs/btrfs/tree-log.c

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3322,6 +3322,30 @@ int btrfs_free_log_root_tree(struct btrfs_trans_handle *trans,
33223322
return 0;
33233323
}
33243324

3325+
/*
3326+
* Check if an inode was logged in the current transaction. We can't always rely
3327+
* on an inode's logged_trans value, because it's an in-memory only field and
3328+
* therefore not persisted. This means that its value is lost if the inode gets
3329+
* evicted and loaded again from disk (in which case it has a value of 0, and
3330+
* certainly it is smaller then any possible transaction ID), when that happens
3331+
* the full_sync flag is set in the inode's runtime flags, so on that case we
3332+
* assume eviction happened and ignore the logged_trans value, assuming the
3333+
* worst case, that the inode was logged before in the current transaction.
3334+
*/
3335+
static bool inode_logged(struct btrfs_trans_handle *trans,
3336+
struct btrfs_inode *inode)
3337+
{
3338+
if (inode->logged_trans == trans->transid)
3339+
return true;
3340+
3341+
if (inode->last_trans == trans->transid &&
3342+
test_bit(BTRFS_INODE_NEEDS_FULL_SYNC, &inode->runtime_flags) &&
3343+
!test_bit(BTRFS_FS_LOG_RECOVERING, &trans->fs_info->flags))
3344+
return true;
3345+
3346+
return false;
3347+
}
3348+
33253349
/*
33263350
* If both a file and directory are logged, and unlinks or renames are
33273351
* mixed in, we have a few interesting corners:
@@ -3356,7 +3380,7 @@ int btrfs_del_dir_entries_in_log(struct btrfs_trans_handle *trans,
33563380
int bytes_del = 0;
33573381
u64 dir_ino = btrfs_ino(dir);
33583382

3359-
if (dir->logged_trans < trans->transid)
3383+
if (!inode_logged(trans, dir))
33603384
return 0;
33613385

33623386
ret = join_running_log_trans(root);
@@ -3460,7 +3484,7 @@ int btrfs_del_inode_ref_in_log(struct btrfs_trans_handle *trans,
34603484
u64 index;
34613485
int ret;
34623486

3463-
if (inode->logged_trans < trans->transid)
3487+
if (!inode_logged(trans, inode))
34643488
return 0;
34653489

34663490
ret = join_running_log_trans(root);

0 commit comments

Comments
 (0)