| Message ID | 20230802154131.2221419-11-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/12] fs: export setup_bdev_super | expand |
On Wed 02-08-23 17:41:29, Christoph Hellwig wrote: > 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> Looks good. Feel free to add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > fs/ext4/super.c | 11 +---------- > 1 file changed, 1 insertion(+), 10 deletions(-) > > diff --git a/fs/ext4/super.c b/fs/ext4/super.c > index 2ccb19d345c6dd..063832e2d12a8e 100644 > --- a/fs/ext4/super.c > +++ b/fs/ext4/super.c > @@ -1096,15 +1096,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 > */ > @@ -1113,7 +1104,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; > -- > 2.39.2 >
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 2ccb19d345c6dd..063832e2d12a8e 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -1096,15 +1096,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 */ @@ -1113,7 +1104,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;
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> --- fs/ext4/super.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-)