Merge tag 'zonefs-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal...

[sfrench/cifs-2.6.git] / fs / jfs / jfs_logmgr.c

diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
index cb6d1fda66a7021a9ce5b42959122be9ad1934b2..73389c68e25170c81d6f84483f09b43216ba4b52 100644 (file)
--- 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 @@ journal_found:
        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->s_bdev_handle;
+       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);