lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 1012/1095] btrfs: tree-log: make the return value for log syncing consistent
    Date
    From: Josef Bacik <josef@toxicpanda.com>

    [ Upstream commit f31f09f6be1c6c1a673e0566e258281a7bbaaa51 ]

    Currently we will return 1 or -EAGAIN if we decide we need to commit
    the transaction rather than sync the log. In practice this doesn't
    really matter, we interpret any !0 and !BTRFS_NO_LOG_SYNC as needing to
    commit the transaction. However this makes it hard to figure out what
    the correct thing to do is.

    Fix this up by defining BTRFS_LOG_FORCE_COMMIT and using this in all the
    places where we want to force the transaction to be committed.

    CC: stable@vger.kernel.org # 5.15+
    Reviewed-by: Filipe Manana <fdmanana@suse.com>
    Signed-off-by: Josef Bacik <josef@toxicpanda.com>
    Reviewed-by: David Sterba <dsterba@suse.com>
    Signed-off-by: David Sterba <dsterba@suse.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/btrfs/file.c | 2 +-
    fs/btrfs/tree-log.c | 18 +++++++++---------
    fs/btrfs/tree-log.h | 3 +++
    3 files changed, 13 insertions(+), 10 deletions(-)

    diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
    index 153920acd226..2d24f2dcc0ea 100644
    --- a/fs/btrfs/file.c
    +++ b/fs/btrfs/file.c
    @@ -2344,7 +2344,7 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
    btrfs_release_log_ctx_extents(&ctx);
    if (ret < 0) {
    /* Fallthrough and commit/free transaction. */
    - ret = 1;
    + ret = BTRFS_LOG_FORCE_COMMIT;
    }

    /* we've logged all the items and now have a consistent
    diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
    index e65633686378..08917069a125 100644
    --- a/fs/btrfs/tree-log.c
    +++ b/fs/btrfs/tree-log.c
    @@ -171,7 +171,7 @@ static int start_log_trans(struct btrfs_trans_handle *trans,
    int index = (root->log_transid + 1) % 2;

    if (btrfs_need_log_full_commit(trans)) {
    - ret = -EAGAIN;
    + ret = BTRFS_LOG_FORCE_COMMIT;
    goto out;
    }

    @@ -194,7 +194,7 @@ static int start_log_trans(struct btrfs_trans_handle *trans,
    * writing.
    */
    if (zoned && !created) {
    - ret = -EAGAIN;
    + ret = BTRFS_LOG_FORCE_COMMIT;
    goto out;
    }

    @@ -3122,7 +3122,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,

    /* bail out if we need to do a full commit */
    if (btrfs_need_log_full_commit(trans)) {
    - ret = -EAGAIN;
    + ret = BTRFS_LOG_FORCE_COMMIT;
    mutex_unlock(&root->log_mutex);
    goto out;
    }
    @@ -3223,7 +3223,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
    }
    btrfs_wait_tree_log_extents(log, mark);
    mutex_unlock(&log_root_tree->log_mutex);
    - ret = -EAGAIN;
    + ret = BTRFS_LOG_FORCE_COMMIT;
    goto out;
    }

    @@ -3262,7 +3262,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
    blk_finish_plug(&plug);
    btrfs_wait_tree_log_extents(log, mark);
    mutex_unlock(&log_root_tree->log_mutex);
    - ret = -EAGAIN;
    + ret = BTRFS_LOG_FORCE_COMMIT;
    goto out_wake_log_root;
    }

    @@ -5849,7 +5849,7 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans,
    inode_only == LOG_INODE_ALL &&
    inode->last_unlink_trans >= trans->transid) {
    btrfs_set_log_full_commit(trans);
    - ret = 1;
    + ret = BTRFS_LOG_FORCE_COMMIT;
    goto out_unlock;
    }

    @@ -6563,12 +6563,12 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans,
    bool log_dentries = false;

    if (btrfs_test_opt(fs_info, NOTREELOG)) {
    - ret = 1;
    + ret = BTRFS_LOG_FORCE_COMMIT;
    goto end_no_trans;
    }

    if (btrfs_root_refs(&root->root_item) == 0) {
    - ret = 1;
    + ret = BTRFS_LOG_FORCE_COMMIT;
    goto end_no_trans;
    }

    @@ -6666,7 +6666,7 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans,
    end_trans:
    if (ret < 0) {
    btrfs_set_log_full_commit(trans);
    - ret = 1;
    + ret = BTRFS_LOG_FORCE_COMMIT;
    }

    if (ret)
    diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h
    index 1620f8170629..57ab5f3b8dc7 100644
    --- a/fs/btrfs/tree-log.h
    +++ b/fs/btrfs/tree-log.h
    @@ -12,6 +12,9 @@
    /* return value for btrfs_log_dentry_safe that means we don't need to log it at all */
    #define BTRFS_NO_LOG_SYNC 256

    +/* We can't use the tree log for whatever reason, force a transaction commit */
    +#define BTRFS_LOG_FORCE_COMMIT (1)
    +
    struct btrfs_log_ctx {
    int log_ret;
    int log_transid;
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-16 01:23    [W:2.603 / U:0.520 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site