f2fs: refactor f2fs_target_device

Don't pass a bio to f2fs_target_device, but instead just optionally
return the sector_t for the block.  This prepares for a new
bio_alloc_bioset calling convention.

Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 9fb6be65592b1f5ec1546c2cfbd7c9d0853635be..170fa5ea8f86423aa8f979749a7dedf76f67c486 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -371,7 +371,7 @@ static void f2fs_write_end_io(struct bio *bio)
 }
 
 struct block_device *f2fs_target_device(struct f2fs_sb_info *sbi,
-                               block_t blk_addr, struct bio *bio)
+                               block_t blk_addr, sector_t *sector)
 {
        struct block_device *bdev = sbi->sb->s_bdev;
        int i;
@@ -381,15 +381,13 @@ struct block_device *f2fs_target_device(struct f2fs_sb_info *sbi,
                        if (FDEV(i).start_blk <= blk_addr &&
                            FDEV(i).end_blk >= blk_addr) {
                                blk_addr -= FDEV(i).start_blk;
-                               bdev = FDEV(i).bdev;
                                break;
                        }
                }
        }
-       if (bio) {
-               bio_set_dev(bio, bdev);
-               bio->bi_iter.bi_sector = SECTOR_FROM_BLOCK(blk_addr);
-       }
+
+       if (sector)
+               *sector = SECTOR_FROM_BLOCK(blk_addr);
        return bdev;
 }
 
@@ -409,11 +407,16 @@ int f2fs_target_device_index(struct f2fs_sb_info *sbi, block_t blkaddr)
 static struct bio *__bio_alloc(struct f2fs_io_info *fio, int npages)
 {
        struct f2fs_sb_info *sbi = fio->sbi;
+       struct block_device *bdev;
        struct bio *bio;
+       sector_t sector;
 
        bio = bio_alloc_bioset(GFP_NOIO, npages, &f2fs_bioset);
 
-       f2fs_target_device(sbi, fio->new_blkaddr, bio);
+       bdev = f2fs_target_device(sbi, fio->new_blkaddr, &sector);
+       bio_set_dev(bio, bdev);
+       bio->bi_iter.bi_sector = sector;
+
        if (is_read_io(fio->op)) {
                bio->bi_end_io = f2fs_read_end_io;
                bio->bi_private = NULL;
@@ -1006,6 +1009,8 @@ static struct bio *f2fs_grab_read_bio(struct inode *inode, block_t blkaddr,
        struct bio *bio;
        struct bio_post_read_ctx *ctx;
        unsigned int post_read_steps = 0;
+       struct block_device *bdev;
+       sector_t sector;
 
        bio = bio_alloc_bioset(for_write ? GFP_NOIO : GFP_KERNEL,
                               min_t(int, nr_pages, BIO_MAX_PAGES),
@@ -1015,7 +1020,9 @@ static struct bio *f2fs_grab_read_bio(struct inode *inode, block_t blkaddr,
 
        f2fs_set_bio_crypt_ctx(bio, inode, first_idx, NULL, GFP_NOFS);
 
-       f2fs_target_device(sbi, blkaddr, bio);
+       bdev = f2fs_target_device(sbi, blkaddr, &sector);
+       bio_set_dev(bio, bdev);
+       bio->bi_iter.bi_sector = sector;
        bio->bi_end_io = f2fs_read_end_io;
        bio_set_op_attrs(bio, REQ_OP_READ, op_flag);
 

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 6c78365d80ceb5c600a72ec4ce276bf2bdf39766..46f20d6c71f9e37172ce6af76e00e19b5fdeea29 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -3438,7 +3438,7 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio);
 int f2fs_merge_page_bio(struct f2fs_io_info *fio);
 void f2fs_submit_page_write(struct f2fs_io_info *fio);
 struct block_device *f2fs_target_device(struct f2fs_sb_info *sbi,
-                       block_t blk_addr, struct bio *bio);
+                       block_t blk_addr, sector_t *sector);
 int f2fs_target_device_index(struct f2fs_sb_info *sbi, block_t blkaddr);
 void f2fs_set_data_blkaddr(struct dnode_of_data *dn);
 void f2fs_update_data_blkaddr(struct dnode_of_data *dn, block_t blkaddr);