| Message ID | 1419929859-24427-7-git-send-email-hch@lst.de |
|---|---|
| State | Superseded |
| Headers | show |
On Tue, 30 Dec 2014 09:57:37 +0100, Christoph Hellwig <hch@lst.de> wrote: > mapping->backing_dev_info will go away, so don't rely on it. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Looks good for me. Acked-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> > --- > fs/nilfs2/super.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c > index 2e5b3ec..3d4bbac 100644 > --- a/fs/nilfs2/super.c > +++ b/fs/nilfs2/super.c > @@ -1057,7 +1057,6 @@ nilfs_fill_super(struct super_block *sb, void *data, int silent) > { > struct the_nilfs *nilfs; > struct nilfs_root *fsroot; > - struct backing_dev_info *bdi; > __u64 cno; > int err; > > @@ -1077,8 +1076,7 @@ nilfs_fill_super(struct super_block *sb, void *data, int silent) > sb->s_time_gran = 1; > sb->s_max_links = NILFS_LINK_MAX; > > - bdi = sb->s_bdev->bd_inode->i_mapping->backing_dev_info; > - sb->s_bdi = bdi ? : &default_backing_dev_info; > + sb->s_bdi = &bdev_get_queue(sb->s_bdev)->backing_dev_info; > > err = load_nilfs(nilfs, sb); > if (err) > -- > 1.9.1 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c index 2e5b3ec..3d4bbac 100644 --- a/fs/nilfs2/super.c +++ b/fs/nilfs2/super.c @@ -1057,7 +1057,6 @@ nilfs_fill_super(struct super_block *sb, void *data, int silent) { struct the_nilfs *nilfs; struct nilfs_root *fsroot; - struct backing_dev_info *bdi; __u64 cno; int err; @@ -1077,8 +1076,7 @@ nilfs_fill_super(struct super_block *sb, void *data, int silent) sb->s_time_gran = 1; sb->s_max_links = NILFS_LINK_MAX; - bdi = sb->s_bdev->bd_inode->i_mapping->backing_dev_info; - sb->s_bdi = bdi ? : &default_backing_dev_info; + sb->s_bdi = &bdev_get_queue(sb->s_bdev)->backing_dev_info; err = load_nilfs(nilfs, sb); if (err)
mapping->backing_dev_info will go away, so don't rely on it. Signed-off-by: Christoph Hellwig <hch@lst.de> --- fs/nilfs2/super.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)