diff --git a/[refs] b/[refs] index 17309fd998cf..1b2d69e47de1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 24797535e18ae219be1fc2632959327075bef5da +refs/heads/master: bba0b5c2c27e6dadc93c476f8a4b49d108b66292 diff --git a/trunk/fs/logfs/super.c b/trunk/fs/logfs/super.c index edd99487f93a..2b2693851969 100644 --- a/trunk/fs/logfs/super.c +++ b/trunk/fs/logfs/super.c @@ -138,10 +138,14 @@ static int logfs_sb_set(struct super_block *sb, void *_super) sb->s_fs_info = super; sb->s_mtd = super->s_mtd; sb->s_bdev = super->s_bdev; +#ifdef CONFIG_BLOCK if (sb->s_bdev) sb->s_bdi = &bdev_get_queue(sb->s_bdev)->backing_dev_info; +#endif +#ifdef CONFIG_MTD if (sb->s_mtd) sb->s_bdi = sb->s_mtd->backing_dev_info; +#endif return 0; }