| Message ID | e348ecdbf6ab68956ba1cd04c51e662ee3589f4d.1663046855.git.wqu@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | btrfs: optimize the argument list for submit_extent_page() | expand |
On 13/09/2022 13:31, Qu Wenruo wrote: > Since commit 390ed29b817e ("btrfs: refactor submit_extent_page() to make > bio and its flag tracing easier"), we are using bio_ctrl structure to > replace some of arguments of submit_extent_page(). > > But unfortunately that commit didn't update the comment for > submit_extent_page(), thus some arguments are stale like: > > - bio_ret > - mirror_num > Those are all contained in bio_ctrl now. > > - prev_bio_flags > We no longer use this flag to determine if we can merge bios. > > So this patch will update the comment for submit_extent_page() to keep > it up-to-date. > > Signed-off-by: Qu Wenruo <wqu@suse.com> Reviewed-by: Anand Jain <anand.jain@oracle.com> > --- > fs/btrfs/extent_io.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c > index cea7d09c2dc1..a3e8232c25ed 100644 > --- a/fs/btrfs/extent_io.c > +++ b/fs/btrfs/extent_io.c > @@ -3347,11 +3347,13 @@ static int alloc_new_bio(struct btrfs_inode *inode, > * @size: portion of page that we want to write to > * @pg_offset: offset of the new bio or to check whether we are adding > * a contiguous page to the previous one > - * @bio_ret: must be valid pointer, newly allocated bio will be stored there > * @end_io_func: end_io callback for new bio > - * @mirror_num: desired mirror to read/write > - * @prev_bio_flags: flags of previous bio to see if we can merge the current one > * @compress_type: compress type for current bio > + * > + * The function will either add the page into the existing @bio_ctrl->bio, > + * or allocate a new one in @bio_ctrl->bio. > + * The mirror number for this IO should already be initizlied in > + * @bio_ctrl->mirror_num. > */ > static int submit_extent_page(blk_opf_t opf, > struct writeback_control *wbc,
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index cea7d09c2dc1..a3e8232c25ed 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -3347,11 +3347,13 @@ static int alloc_new_bio(struct btrfs_inode *inode, * @size: portion of page that we want to write to * @pg_offset: offset of the new bio or to check whether we are adding * a contiguous page to the previous one - * @bio_ret: must be valid pointer, newly allocated bio will be stored there * @end_io_func: end_io callback for new bio - * @mirror_num: desired mirror to read/write - * @prev_bio_flags: flags of previous bio to see if we can merge the current one * @compress_type: compress type for current bio + * + * The function will either add the page into the existing @bio_ctrl->bio, + * or allocate a new one in @bio_ctrl->bio. + * The mirror number for this IO should already be initizlied in + * @bio_ctrl->mirror_num. */ static int submit_extent_page(blk_opf_t opf, struct writeback_control *wbc,
Since commit 390ed29b817e ("btrfs: refactor submit_extent_page() to make bio and its flag tracing easier"), we are using bio_ctrl structure to replace some of arguments of submit_extent_page(). But unfortunately that commit didn't update the comment for submit_extent_page(), thus some arguments are stale like: - bio_ret - mirror_num Those are all contained in bio_ctrl now. - prev_bio_flags We no longer use this flag to determine if we can merge bios. So this patch will update the comment for submit_extent_page() to keep it up-to-date. Signed-off-by: Qu Wenruo <wqu@suse.com> --- fs/btrfs/extent_io.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)