Merge branch 'for-4.14/block' of git://git.kernel.dk/linux-block

[linux.git] / fs / gfs2 / ops_fstype.c

diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index e76058d34b7468b3762a6955f401af822c7a8e9a..84593587691d48bf92e6081ca736df0fd0a645ee 100644 (file)
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -242,7 +242,7 @@ static int gfs2_read_super(struct gfs2_sbd *sdp, sector_t sector, int silent)
 
        bio = bio_alloc(GFP_NOFS, 1);
        bio->bi_iter.bi_sector = sector * (sb->s_blocksize >> 9);
-       bio->bi_bdev = sb->s_bdev;
+       bio_set_dev(bio, sb->s_bdev);
        bio_add_page(bio, page, PAGE_SIZE, 0);
 
        bio->bi_end_io = end_bio_io_page;
@@ -1113,7 +1113,7 @@ static int fill_super(struct super_block *sb, struct gfs2_args *args, int silent
                return error;
        }
 
-       snprintf(sdp->sd_fsname, GFS2_FSNAME_LEN, "%s", sdp->sd_table_name);
+       snprintf(sdp->sd_fsname, sizeof(sdp->sd_fsname), "%s", sdp->sd_table_name);
 
        error = gfs2_sys_fs_add(sdp);
        /*
@@ -1159,10 +1159,10 @@ static int fill_super(struct super_block *sb, struct gfs2_args *args, int silent
        }
 
        if (sdp->sd_args.ar_spectator)
-               snprintf(sdp->sd_fsname, GFS2_FSNAME_LEN, "%s.s",
+               snprintf(sdp->sd_fsname, sizeof(sdp->sd_fsname), "%s.s",
                         sdp->sd_table_name);
        else
-               snprintf(sdp->sd_fsname, GFS2_FSNAME_LEN, "%s.%u",
+               snprintf(sdp->sd_fsname, sizeof(sdp->sd_fsname), "%s.%u",
                         sdp->sd_table_name, sdp->sd_lockstruct.ls_jid);
 
        error = init_inodes(sdp, DO);
@@ -1388,7 +1388,6 @@ static void gfs2_kill_sb(struct super_block *sb)
        sdp->sd_root_dir = NULL;
        sdp->sd_master_dir = NULL;
        shrink_dcache_sb(sb);
-       gfs2_delete_debugfs_file(sdp);
        free_percpu(sdp->sd_lkstats);
        kill_block_super(sb);
 }