Re: [PATCH 25/32] jfs: Convert to blkdev_get_handle_by_dev()

[Dave Kleikamp <dave.kleikamp@xxxxxxxxxx>]

On 7/4/23 7:21AM, Jan Kara wrote:
> Convert jfs to use blkdev_get_handle_by_dev() and pass the handle
> around.

No problem from jfs's persepective.

Acked-by: Dave Kleikamp <dave.kleikamp@xxxxxxxxxx>

> CC: Dave Kleikamp <shaggy@xxxxxxxxxx>
> CC: jfs-discussion@xxxxxxxxxxxxxxxxxxxxx
> Signed-off-by: Jan Kara <jack@xxxxxxx>
> ---
>   fs/jfs/jfs_logmgr.c | 29 +++++++++++++++--------------
>   fs/jfs/jfs_logmgr.h |  2 +-
>   fs/jfs/jfs_mount.c  |  3 ++-
>   3 files changed, 18 insertions(+), 16 deletions(-)
>
> diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
> index e855b8fde76c..9d06323261e6 100644
> --- a/fs/jfs/jfs_logmgr.c
> +++ b/fs/jfs/jfs_logmgr.c
> @@ -1058,7 +1058,7 @@ void jfs_syncpt(struct jfs_log *log, int hard_sync)
>   int lmLogOpen(struct super_block *sb)
>   {
>   	int rc;
> -	struct block_device *bdev;
> +	struct bdev_handle *bdev_handle;
>   	struct jfs_log *log;
>   	struct jfs_sb_info *sbi = JFS_SBI(sb);
>   
> @@ -1070,7 +1070,7 @@ int lmLogOpen(struct super_block *sb)
>   
>   	mutex_lock(&jfs_log_mutex);
>   	list_for_each_entry(log, &jfs_external_logs, journal_list) {
> -		if (log->bdev->bd_dev == sbi->logdev) {
> +		if (log->bdev_handle->bdev->bd_dev == sbi->logdev) {
>   			if (!uuid_equal(&log->uuid, &sbi->loguuid)) {
>   				jfs_warn("wrong uuid on JFS journal");
>   				mutex_unlock(&jfs_log_mutex);
> @@ -1100,14 +1100,14 @@ int lmLogOpen(struct super_block *sb)
>   	 * file systems to log may have n-to-1 relationship;
>   	 */
>   
> -	bdev = blkdev_get_by_dev(sbi->logdev, BLK_OPEN_READ | BLK_OPEN_WRITE,
> -				 log, NULL);
> -	if (IS_ERR(bdev)) {
> -		rc = PTR_ERR(bdev);
> +	bdev_handle = blkdev_get_handle_by_dev(sbi->logdev,
> +			BLK_OPEN_READ | BLK_OPEN_WRITE, log, NULL);
> +	if (IS_ERR(bdev_handle)) {
> +		rc = PTR_ERR(bdev_handle);
>   		goto free;
>   	}
>   
> -	log->bdev = bdev;
> +	log->bdev_handle = bdev_handle;
>   	uuid_copy(&log->uuid, &sbi->loguuid);
>   
>   	/*
> @@ -1141,7 +1141,7 @@ int lmLogOpen(struct super_block *sb)
>   	lbmLogShutdown(log);
>   
>         close:		/* close external log device */
> -	blkdev_put(bdev, log);
> +	blkdev_handle_put(bdev_handle);
>   
>         free:		/* free log descriptor */
>   	mutex_unlock(&jfs_log_mutex);
> @@ -1162,7 +1162,7 @@ static int open_inline_log(struct super_block *sb)
>   	init_waitqueue_head(&log->syncwait);
>   
>   	set_bit(log_INLINELOG, &log->flag);
> -	log->bdev = sb->s_bdev;
> +	log->bdev_handle = sb->s_bdev_handle;
>   	log->base = addressPXD(&JFS_SBI(sb)->logpxd);
>   	log->size = lengthPXD(&JFS_SBI(sb)->logpxd) >>
>   	    (L2LOGPSIZE - sb->s_blocksize_bits);
> @@ -1436,7 +1436,7 @@ int lmLogClose(struct super_block *sb)
>   {
>   	struct jfs_sb_info *sbi = JFS_SBI(sb);
>   	struct jfs_log *log = sbi->log;
> -	struct block_device *bdev;
> +	struct bdev_handle *bdev_handle;
>   	int rc = 0;
>   
>   	jfs_info("lmLogClose: log:0x%p", log);
> @@ -1482,10 +1482,10 @@ int lmLogClose(struct super_block *sb)
>   	 *	external log as separate logical volume
>   	 */
>   	list_del(&log->journal_list);
> -	bdev = log->bdev;
> +	bdev_handle = log->bdev_handle;
>   	rc = lmLogShutdown(log);
>   
> -	blkdev_put(bdev, log);
> +	blkdev_handle_put(bdev_handle);
>   
>   	kfree(log);
>   
> @@ -1972,7 +1972,7 @@ static int lbmRead(struct jfs_log * log, int pn, struct lbuf ** bpp)
>   
>   	bp->l_flag |= lbmREAD;
>   
> -	bio = bio_alloc(log->bdev, 1, REQ_OP_READ, GFP_NOFS);
> +	bio = bio_alloc(log->bdev_handle->bdev, 1, REQ_OP_READ, GFP_NOFS);
>   	bio->bi_iter.bi_sector = bp->l_blkno << (log->l2bsize - 9);
>   	__bio_add_page(bio, bp->l_page, LOGPSIZE, bp->l_offset);
>   	BUG_ON(bio->bi_iter.bi_size != LOGPSIZE);
> @@ -2113,7 +2113,8 @@ static void lbmStartIO(struct lbuf * bp)
>   
>   	jfs_info("lbmStartIO");
>   
> -	bio = bio_alloc(log->bdev, 1, REQ_OP_WRITE | REQ_SYNC, GFP_NOFS);
> +	bio = bio_alloc(log->bdev_handle->bdev, 1, REQ_OP_WRITE | REQ_SYNC,
> +			GFP_NOFS);
>   	bio->bi_iter.bi_sector = bp->l_blkno << (log->l2bsize - 9);
>   	__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_logmgr.h b/fs/jfs/jfs_logmgr.h
> index 805877ce5020..84aa2d253907 100644
> --- a/fs/jfs/jfs_logmgr.h
> +++ b/fs/jfs/jfs_logmgr.h
> @@ -356,7 +356,7 @@ struct jfs_log {
>   				 *    before writing syncpt.
>   				 */
>   	struct list_head journal_list; /* Global list */
> -	struct block_device *bdev; /* 4: log lv pointer */
> +	struct bdev_handle *bdev_handle; /* 4: log lv pointer */
>   	int serial;		/* 4: log mount serial number */
>   
>   	s64 base;		/* @8: log extent address (inline log ) */
> diff --git a/fs/jfs/jfs_mount.c b/fs/jfs/jfs_mount.c
> index b83aae56a1f2..415eb65a36ff 100644
> --- a/fs/jfs/jfs_mount.c
> +++ b/fs/jfs/jfs_mount.c
> @@ -430,7 +430,8 @@ int updateSuper(struct super_block *sb, uint state)
>   
>   	if (state == FM_MOUNT) {
>   		/* record log's dev_t and mount serial number */
> -		j_sb->s_logdev = cpu_to_le32(new_encode_dev(sbi->log->bdev->bd_dev));
> +		j_sb->s_logdev = cpu_to_le32(
> +			new_encode_dev(sbi->log->bdev_handle->bdev->bd_dev));
>   		j_sb->s_logserial = cpu_to_le32(sbi->log->serial);
>   	} else if (state == FM_CLEAN) {
>   		/*