diff options
| author | Ingo Molnar <mingo@kernel.org> | 2021-05-12 19:59:37 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-05-12 19:59:37 +0200 |
| commit | 6f0d271d21c5dc12b78cc7d8b241a5acbca5589f (patch) | |
| tree | 1d8992505405f69d08bdc3d5e24f3ee200c30ffb /fs/btrfs/tree-log.c | |
| parent | 1bc67873d401e6c2e6e30be7fef21337db07a042 (diff) | |
| parent | 88b06399c9c766c283e070b022b5ceafa4f63f19 (diff) | |
Merge branch 'linus' into x86/cleanups, to pick up dependent commits
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'fs/btrfs/tree-log.c')
| -rw-r--r-- | fs/btrfs/tree-log.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index f67721d82e5d..95a600034d61 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c @@ -6061,7 +6061,8 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans, * (since logging them is pointless, a link count of 0 means they * will never be accessible). */ - if (btrfs_inode_in_log(inode, trans->transid) || + if ((btrfs_inode_in_log(inode, trans->transid) && + list_empty(&ctx->ordered_extents)) || inode->vfs_inode.i_nlink == 0) { ret = BTRFS_NO_LOG_SYNC; goto end_no_trans; |