Commit 301f5356 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: remove bio_release_page 



Merge bio_release_page into the only remaining caller.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAnuj Gupta <anuj20.g@samsung.com>
Reviewed-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Tested-by: default avatarAnuj Gupta <anuj20.g@samsung.com>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 91b73c45

block/bio.c

+3 −1
Original line number Diff line number Diff line
@@ -1195,7 +1195,9 @@ static int bio_iov_iter_align_down(struct bio *bio, struct iov_iter *iter, 
			break;

		}



		bio_release_page(bio, bv->bv_page);

		if (bio_flagged(bio, BIO_PAGE_PINNED))

			unpin_user_page(bv->bv_page);



		bio->bi_vcnt--;

		nbytes -= bv->bv_len;

	} while (nbytes);

block/blk.h

+0 −11
Original line number Diff line number Diff line
@@ -595,17 +595,6 @@ void bdev_set_nr_sectors(struct block_device *bdev, sector_t sectors); 


struct gendisk *__alloc_disk_node(struct request_queue *q, int node_id,

		struct lock_class_key *lkclass);



/*

 * Clean up a page appropriately, where the page may be pinned, may have a

 * ref taken on it or neither.

 */

static inline void bio_release_page(struct bio *bio, struct page *page)

{

	if (bio_flagged(bio, BIO_PAGE_PINNED))

		unpin_user_page(page);

}



struct request_queue *blk_alloc_queue(struct queue_limits *lim, int node_id);



int disk_scan_partitions(struct gendisk *disk, blk_mode_t mode);