Both bd_fsfreeze_mutex and bd_fsfreeze_sb are now unused and can be
removed. Also move bd_fsfreeze_count down to not have it weirdly placed
in the middle of the holder fields.
Suggested-by: Jan Kara <jack@xxxxxxx>
Suggested-by: Christoph Hellwig <hch@xxxxxx>
Signed-off-by: Christian Brauner <brauner@xxxxxxxxxx>
---
block/bdev.c | 1 -
include/linux/blk_types.h | 7 ++-----
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/block/bdev.c b/block/bdev.c
index 3deccd0ffcf2..084855b669f7 100644
--- a/block/bdev.c
+++ b/block/bdev.c
@@ -392,7 +392,6 @@ struct block_device *bdev_alloc(struct gendisk *disk, u8 partno)
mapping_set_gfp_mask(&inode->i_data, GFP_USER);
bdev = I_BDEV(inode);
- mutex_init(&bdev->bd_fsfreeze_mutex);
spin_lock_init(&bdev->bd_size_lock);
mutex_init(&bdev->bd_holder_lock);
bdev->bd_partno = partno;
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index 88e1848b0869..0238236852b7 100644
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -56,14 +56,11 @@ struct block_device {
void * bd_holder;
const struct blk_holder_ops *bd_holder_ops;
struct mutex bd_holder_lock;
- /* The counter of freeze processes */
- atomic_t bd_fsfreeze_count;
int bd_holders;
struct kobject *bd_holder_dir;
- /* Mutex for freeze */
- struct mutex bd_fsfreeze_mutex;
- struct super_block *bd_fsfreeze_sb;
+ /* The counter of freeze processes */
+ atomic_t bd_fsfreeze_count;
struct partition_meta_info *bd_meta_info;
#ifdef CONFIG_FAIL_MAKE_REQUEST
--
2.34.1
