Skip to content

Commit 9573a36

Browse files
fdmananakdave
authored andcommitted
btrfs: log new dentries when logging parent dir of a conflicting inode
If we log the parent directory of a conflicting inode, we are not logging the new dentries of the directory, so when we finish we have the parent directory's inode marked as logged but we did not log its new dentries. As a consequence if the parent directory is explicitly fsynced later and it does not have any new changes since we logged it, the fsync is a no-op and after a power failure the new dentries are missing. Example scenario: $ mkdir foo $ sync $rmdir foo $ mkdir dir1 $ mkdir dir2 # A file with the same name and parent as the directory we just deleted # and was persisted in a past transaction. So the deleted directory's # inode is a conflicting inode of this new file's inode. $ touch foo $ ln foo dir2/link # The fsync on dir2 will log the parent directory (".") because the # conflicting inode (deleted directory) does not exists anymore, but it # it does not log its new dentries (dir1). $ xfs_io -c "fsync" dir2 # This fsync on the parent directory is no-op, since the previous fsync # logged it (but without logging its new dentries). $ xfs_io -c "fsync" . <power failure> # After log replay dir1 is missing. Fix this by ensuring we log new dir dentries whenever we log the parent directory of a no longer existing conflicting inode. A test case for fstests will follow soon. Reported-by: Vyacheslav Kovalevsky <[email protected]> Link: https://lore.kernel.org/linux-btrfs/[email protected]/ Fixes: a3baaf0 ("Btrfs: fix fsync after succession of renames and unlink/rmdir") Reviewed-by: Boris Burkov <[email protected]> Signed-off-by: Filipe Manana <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 77603ab commit 9573a36

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

fs/btrfs/tree-log.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6195,6 +6195,7 @@ static int log_conflicting_inodes(struct btrfs_trans_handle *trans,
61956195
struct btrfs_root *root,
61966196
struct btrfs_log_ctx *ctx)
61976197
{
6198+
const bool orig_log_new_dentries = ctx->log_new_dentries;
61986199
int ret = 0;
61996200

62006201
/*
@@ -6256,7 +6257,11 @@ static int log_conflicting_inodes(struct btrfs_trans_handle *trans,
62566257
* dir index key range logged for the directory. So we
62576258
* must make sure the deletion is recorded.
62586259
*/
6260+
ctx->log_new_dentries = false;
62596261
ret = btrfs_log_inode(trans, inode, LOG_INODE_ALL, ctx);
6262+
if (!ret && ctx->log_new_dentries)
6263+
ret = log_new_dir_dentries(trans, inode, ctx);
6264+
62606265
btrfs_add_delayed_iput(inode);
62616266
if (ret)
62626267
break;
@@ -6291,6 +6296,7 @@ static int log_conflicting_inodes(struct btrfs_trans_handle *trans,
62916296
break;
62926297
}
62936298

6299+
ctx->log_new_dentries = orig_log_new_dentries;
62946300
ctx->logging_conflict_inodes = false;
62956301
if (ret)
62966302
free_conflicting_inodes(ctx);

0 commit comments

Comments
 (0)