Skip to content

Commit

Permalink
ext4: use fs_holder_ops for the log device
Browse files Browse the repository at this point in the history
Use the generic fs_holder_ops to shut down the file system when the
log device goes away instead of duplicating the logic.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jan Kara <jack@suse.cz>
Message-Id: <20230802154131.2221419-11-hch@lst.de>
Signed-off-by: Christian Brauner <brauner@kernel.org>
  • Loading branch information
Christoph Hellwig authored and Christian Brauner committed Aug 11, 2023
1 parent 6f5fc7d commit 8bed178
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions fs/ext4/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -1097,15 +1097,6 @@ void ext4_update_dynamic_rev(struct super_block *sb)
*/
}

static void ext4_bdev_mark_dead(struct block_device *bdev)
{
ext4_force_shutdown(bdev->bd_holder, EXT4_GOING_FLAGS_NOLOGFLUSH);
}

static const struct blk_holder_ops ext4_holder_ops = {
.mark_dead = ext4_bdev_mark_dead,
};

/*
* Open the external journal device
*/
Expand All @@ -1114,7 +1105,7 @@ static struct block_device *ext4_blkdev_get(dev_t dev, struct super_block *sb)
struct block_device *bdev;

bdev = blkdev_get_by_dev(dev, BLK_OPEN_READ | BLK_OPEN_WRITE, sb,
&ext4_holder_ops);
&fs_holder_ops);
if (IS_ERR(bdev))
goto fail;
return bdev;
Expand Down

0 comments on commit 8bed178

Please sign in to comment.