2021-01-28 07:41:42

by Chaitanya Kulkarni

Subject: [RFC PATCH 19/34] fs/jfs/jfs_logmgr.c: use bio_new in lbmRead

Signed-off-by: Chaitanya Kulkarni <[email protected]>
---
fs/jfs/jfs_logmgr.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
index 9330eff210e0..4481f3e33a3f 100644
--- a/fs/jfs/jfs_logmgr.c
+++ b/fs/jfs/jfs_logmgr.c
@@ -1979,17 +1979,14 @@ static int lbmRead(struct jfs_log * log, int pn, struct lbuf ** bpp)

bp->l_flag |= lbmREAD;

- bio = bio_alloc(GFP_NOFS, 1);
-
- bio->bi_iter.bi_sector = bp->l_blkno << (log->l2bsize - 9);
- bio_set_dev(bio, log->bdev);
+ bio = bio_new(log->bdev, bp->l_blkno << (log->l2bsize - 9),
+ REQ_OP_READ, 0, 1, GFP_NOFS);

bio_add_page(bio, bp->l_page, LOGPSIZE, bp->l_offset);
BUG_ON(bio->bi_iter.bi_size != LOGPSIZE);

bio->bi_end_io = lbmIODone;
bio->bi_private = bp;
- bio->bi_opf = REQ_OP_READ;
/*check if journaling to disk has been disabled*/
if (log->no_integrity) {
bio->bi_iter.bi_size = 0;
--
2.22.1

2021-01-28 12:48:24

by Dave Kleikamp

Subject: Re: [RFC PATCH 19/34] fs/jfs/jfs_logmgr.c: use bio_new in lbmRead

You probably don't need 4 patches to fs/jfs/. These can be combined into
a single patch.

Dave

On 1/28/21 1:11 AM, Chaitanya Kulkarni wrote:
> Signed-off-by: Chaitanya Kulkarni <[email protected]>
> ---
> fs/jfs/jfs_logmgr.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
> index 9330eff210e0..4481f3e33a3f 100644
> --- a/fs/jfs/jfs_logmgr.c
> +++ b/fs/jfs/jfs_logmgr.c
> @@ -1979,17 +1979,14 @@ static int lbmRead(struct jfs_log * log, int pn, struct lbuf ** bpp)
>
> bp->l_flag |= lbmREAD;
>
> - bio = bio_alloc(GFP_NOFS, 1);
> -
> - bio->bi_iter.bi_sector = bp->l_blkno << (log->l2bsize - 9);
> - bio_set_dev(bio, log->bdev);
> + bio = bio_new(log->bdev, bp->l_blkno << (log->l2bsize - 9),
> + REQ_OP_READ, 0, 1, GFP_NOFS);
>
> bio_add_page(bio, bp->l_page, LOGPSIZE, bp->l_offset);
> BUG_ON(bio->bi_iter.bi_size != LOGPSIZE);
>
> bio->bi_end_io = lbmIODone;
> bio->bi_private = bp;
> - bio->bi_opf = REQ_OP_READ;
> /*check if journaling to disk has been disabled*/
> if (log->no_integrity) {
> bio->bi_iter.bi_size = 0;
>