On Thu 10-09-20 16:31:26, Mauricio Faria de Oliveira wrote:
> Introduce journal callbacks to allow different behaviors
> for an inode in journal_submit|finish_inode_data_buffers().
>
> The existing users of the current behavior (ext4, ocfs2)
> are adapted to use the previously exported functions
> that implement the current behavior.
>
> Users are callers of jbd2_journal_inode_ranged_write|wait(),
> which adds the inode to the transaction's inode list with
> the JI_WRITE|WAIT_DATA flags. Only ext4 and ocfs2 in-tree.
>
> Signed-off-by: Mauricio Faria de Oliveira <mfo@xxxxxxxxxxxxx>
> Suggested-by: Jan Kara <jack@xxxxxxx>
> ---
> fs/ext4/super.c | 14 ++++++++++++++
> fs/jbd2/commit.c | 30 ++++++++++++++++++------------
> fs/ocfs2/super.c | 15 +++++++++++++++
> include/linux/jbd2.h | 25 ++++++++++++++++++++++++-
> 4 files changed, 71 insertions(+), 13 deletions(-)
>
> diff --git a/fs/ext4/super.c b/fs/ext4/super.c
> index ea425b49b345..7303839d7ad9 100644
> --- a/fs/ext4/super.c
> +++ b/fs/ext4/super.c
> @@ -472,6 +472,16 @@ static void ext4_journal_commit_callback(journal_t *journal, transaction_t *txn)
> spin_unlock(&sbi->s_md_lock);
> }
>
> +static int ext4_journal_submit_inode_data_buffers(struct jbd2_inode *jinode)
> +{
> + return jbd2_journal_submit_inode_data_buffers(jinode);
> +}
> +
> +static int ext4_journal_finish_inode_data_buffers(struct jbd2_inode *jinode)
> +{
> + return jbd2_journal_finish_inode_data_buffers(jinode);
> +}
> +
No need for these ext4 wrappers. They just obfuscate code... Ditto for
ocfs2 below.
> @@ -1111,6 +1113,27 @@ struct journal_s
> void (*j_commit_callback)(journal_t *,
> transaction_t *);
>
> + /**
> + * @j_submit_inode_data_buffers:
> + *
> + * This function is called for all inodes associated with the
> + * committing transaction marked with JI_WRITE_DATA flag
> + * before we start to write out the transaction to the journal.
> + */
> + int (*j_submit_inode_data_buffers)
> + (struct jbd2_inode *);
> +
> + /**
> + * @j_finish_inode_data_buffers:
> + *
> + * This function is called for all inodes associated with the
> + * committing transaction marked with JI_WAIT_DATA flag
> + * after we have written the transaction to the journal
> + * but before we write out the commit block.
> + */
> + int (*j_finish_inode_data_buffers)
> + (struct jbd2_inode *);
> +
Having the callbacks in the journal_s will not work if we have inodes with
data journalling on a filesystem mounted in data=ordered mode. The
callbacks really need to be a per-inode thing so I'd add them to struct
jbd2_inode.
Honza
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
