block: replace bi_bdev with a gendisk pointer and partitions index

This way we don't need a block_device structure to submit I/O.  The
block_device has different life time rules from the gendisk and
request_queue and is usually only available when the block device node
is open.  Other callers need to explicitly create one (e.g. the lightnvm
passthrough code, or the new nvme multipathing code).

For the actual I/O path all that we need is the gendisk, which exists
once per block device.  But given that the block layer also does
partition remapping we additionally need a partition index, which is
used for said remapping in generic_make_request.

Note that all the block drivers generally want request_queue or
sometimes the gendisk, so this removes a layer of indirection all
over the stack.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

2 files changed, 4 insertions, 4 deletions

diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
index a21f0e9eecd4..0e5d412c0b01 100644
--- a/fs/jfs/jfs_logmgr.c
+++ b/fs/jfs/jfs_logmgr.c
@@ -1995,7 +1995,7 @@ static int lbmRead(struct jfs_log * log, int pn, struct lbuf ** bpp)
         bio = bio_alloc(GFP_NOFS, 1);
 
         bio->bi_iter.bi_sector = bp->l_blkno << (log->l2bsize - 9);
-        bio->bi_bdev = log->bdev;
+        bio_set_dev(bio, log->bdev);
 
         bio_add_page(bio, bp->l_page, LOGPSIZE, bp->l_offset);
         BUG_ON(bio->bi_iter.bi_size != LOGPSIZE);
@@ -2139,7 +2139,7 @@ static void lbmStartIO(struct lbuf * bp)
 
         bio = bio_alloc(GFP_NOFS, 1);
         bio->bi_iter.bi_sector = bp->l_blkno << (log->l2bsize - 9);
-        bio->bi_bdev = log->bdev;
+        bio_set_dev(bio, log->bdev);
 
         bio_add_page(bio, bp->l_page, LOGPSIZE, bp->l_offset);
         BUG_ON(bio->bi_iter.bi_size != LOGPSIZE);
diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c
index 65120a471729..1c4b9ad4d7ab 100644
--- a/fs/jfs/jfs_metapage.c
+++ b/fs/jfs/jfs_metapage.c
@@ -430,7 +430,7 @@ static int metapage_writepage(struct page *page, struct writeback_control *wbc)
                 len = min(xlen, (int)JFS_SBI(inode->i_sb)->nbperpage);
 
                 bio = bio_alloc(GFP_NOFS, 1);
-                bio->bi_bdev = inode->i_sb->s_bdev;
+                bio_set_dev(bio, inode->i_sb->s_bdev);
                 bio->bi_iter.bi_sector = pblock << (inode->i_blkbits - 9);
                 bio->bi_end_io = metapage_write_end_io;
                 bio->bi_private = page;
@@ -510,7 +510,7 @@ static int metapage_readpage(struct file *fp, struct page *page)
                                 submit_bio(bio);
 
                         bio = bio_alloc(GFP_NOFS, 1);
-                        bio->bi_bdev = inode->i_sb->s_bdev;
+                        bio_set_dev(bio, inode->i_sb->s_bdev);
                         bio->bi_iter.bi_sector =
                                 pblock << (inode->i_blkbits - 9);
                         bio->bi_end_io = metapage_read_end_io;