On Tue 23-01-24 14:26:40, Christian Brauner wrote:
> Signed-off-by: Christian Brauner <brauner@xxxxxxxxxx>
Looks good. Feel free to add:
Reviewed-by: Jan Kara <jack@xxxxxxx>
Honza
> ---
> fs/jfs/jfs_logmgr.c | 26 +++++++++++++-------------
> fs/jfs/jfs_logmgr.h | 2 +-
> fs/jfs/jfs_mount.c | 2 +-
> 3 files changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
> index 8691463956d1..73389c68e251 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 bdev_handle *bdev_handle;
> + struct file *bdev_file;
> 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_handle->bdev->bd_dev == sbi->logdev) {
> + if (file_bdev(log->bdev_file)->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_handle = bdev_open_by_dev(sbi->logdev,
> + bdev_file = bdev_file_open_by_dev(sbi->logdev,
> BLK_OPEN_READ | BLK_OPEN_WRITE, log, NULL);
> - if (IS_ERR(bdev_handle)) {
> - rc = PTR_ERR(bdev_handle);
> + if (IS_ERR(bdev_file)) {
> + rc = PTR_ERR(bdev_file);
> goto free;
> }
>
> - log->bdev_handle = bdev_handle;
> + log->bdev_file = bdev_file;
> uuid_copy(&log->uuid, &sbi->loguuid);
>
> /*
> @@ -1141,7 +1141,7 @@ int lmLogOpen(struct super_block *sb)
> lbmLogShutdown(log);
>
> close: /* close external log device */
> - bdev_release(bdev_handle);
> + fput(bdev_file);
>
> 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_handle = sb_bdev_handle(sb);
> + log->bdev_file = sb->s_bdev_file;
> 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 bdev_handle *bdev_handle;
> + struct file *bdev_file;
> 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_handle = log->bdev_handle;
> + bdev_file = log->bdev_file;
> rc = lmLogShutdown(log);
>
> - bdev_release(bdev_handle);
> + fput(bdev_file);
>
> 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_handle->bdev, 1, REQ_OP_READ, GFP_NOFS);
> + bio = bio_alloc(file_bdev(log->bdev_file), 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);
> @@ -2115,7 +2115,7 @@ static void lbmStartIO(struct lbuf * bp)
> jfs_info("lbmStartIO");
>
> if (!log->no_integrity)
> - bdev = log->bdev_handle->bdev;
> + bdev = file_bdev(log->bdev_file);
>
> bio = bio_alloc(bdev, 1, REQ_OP_WRITE | REQ_SYNC,
> GFP_NOFS);
> diff --git a/fs/jfs/jfs_logmgr.h b/fs/jfs/jfs_logmgr.h
> index 84aa2d253907..8b8994e48cd0 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 bdev_handle *bdev_handle; /* 4: log lv pointer */
> + struct file *bdev_file; /* 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 9b5c6a20b30c..98f9a432c336 100644
> --- a/fs/jfs/jfs_mount.c
> +++ b/fs/jfs/jfs_mount.c
> @@ -431,7 +431,7 @@ 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_handle->bdev->bd_dev));
> + new_encode_dev(file_bdev(sbi->log->bdev_file)->bd_dev));
> j_sb->s_logserial = cpu_to_le32(sbi->log->serial);
> } else if (state == FM_CLEAN) {
> /*
>
> --
> 2.43.0
>
--
Jan Kara <jack@xxxxxxxx>
SUSE Labs, CR
