| Message ID | 20240222124555.2049140-10-yukuai1@huaweicloud.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | fs & block: remove bdev->bd_inode | expand |
On Thu 22-02-24 20:45:45, Yu Kuai wrote: > From: Yu Kuai <yukuai3@huawei.com> > > Now that all filesystems stash the bdev file, it's ok to get inode > from the file. > > Signed-off-by: Yu Kuai <yukuai3@huawei.com> Looks good. Feel free to add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > fs/gfs2/glock.c | 2 +- > fs/gfs2/ops_fstype.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c > index 34540f9d011c..95ade8979f6b 100644 > --- a/fs/gfs2/glock.c > +++ b/fs/gfs2/glock.c > @@ -1227,7 +1227,7 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number, > mapping = gfs2_glock2aspace(gl); > if (mapping) { > mapping->a_ops = &gfs2_meta_aops; > - mapping->host = s->s_bdev->bd_inode; > + mapping->host = file_inode(s->s_bdev_file); > mapping->flags = 0; > mapping_set_gfp_mask(mapping, GFP_NOFS); > mapping->i_private_data = NULL; > diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c > index 572d58e86296..4384cb39b06c 100644 > --- a/fs/gfs2/ops_fstype.c > +++ b/fs/gfs2/ops_fstype.c > @@ -114,7 +114,7 @@ static struct gfs2_sbd *init_sbd(struct super_block *sb) > > address_space_init_once(mapping); > mapping->a_ops = &gfs2_rgrp_aops; > - mapping->host = sb->s_bdev->bd_inode; > + mapping->host = file_inode(sb->s_bdev_file); > mapping->flags = 0; > mapping_set_gfp_mask(mapping, GFP_NOFS); > mapping->i_private_data = NULL; > -- > 2.39.2 >
Looks good:
Reviewed-by: Christoph Hellwig <hch@lst.de>
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index 34540f9d011c..95ade8979f6b 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c @@ -1227,7 +1227,7 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number, mapping = gfs2_glock2aspace(gl); if (mapping) { mapping->a_ops = &gfs2_meta_aops; - mapping->host = s->s_bdev->bd_inode; + mapping->host = file_inode(s->s_bdev_file); mapping->flags = 0; mapping_set_gfp_mask(mapping, GFP_NOFS); mapping->i_private_data = NULL; diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c index 572d58e86296..4384cb39b06c 100644 --- a/fs/gfs2/ops_fstype.c +++ b/fs/gfs2/ops_fstype.c @@ -114,7 +114,7 @@ static struct gfs2_sbd *init_sbd(struct super_block *sb) address_space_init_once(mapping); mapping->a_ops = &gfs2_rgrp_aops; - mapping->host = sb->s_bdev->bd_inode; + mapping->host = file_inode(sb->s_bdev_file); mapping->flags = 0; mapping_set_gfp_mask(mapping, GFP_NOFS); mapping->i_private_data = NULL;