Skip to content

Commit 5a20d42

Browse files
committed
Linux 4.12 compat: super_setup_bdi_name() - add missing code
This includes code that was mistakenly left out of the 7dae2c8 merge into 0.6.5.10. Its inclusion fixes a kernel warning on Kubuntu 17.04: WARN_ON(sb->s_bdi != &noop_backing_dev_info); Reviewed-by: Chunwei Chen <david.chen@osnexus.com> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes #6089 Closes #6324 (backported from zfs upstream commit 7dae2c8) Signed-off-by: Colin Ian King <colin.king@canonical.com>
1 parent bf04e4d commit 5a20d42

2 files changed

Lines changed: 0 additions & 3 deletions

File tree

include/sys/zfs_vfsops.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ typedef struct zfs_mntopts {
6464

6565
typedef struct zfs_sb {
6666
struct super_block *z_sb; /* generic super_block */
67-
struct backing_dev_info z_bdi; /* generic backing dev info */
6867
struct zfs_sb *z_parent; /* parent fs */
6968
objset_t *z_os; /* objset reference */
7069
zfs_mntopts_t *z_mntopts; /* passed mount options */

module/zfs/zfs_vfsops.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1403,8 +1403,6 @@ zfs_domount(struct super_block *sb, zfs_mntopts_t *zmo, int silent)
14031403
sb->s_time_gran = 1;
14041404
sb->s_blocksize = recordsize;
14051405
sb->s_blocksize_bits = ilog2(recordsize);
1406-
zsb->z_bdi.ra_pages = 0;
1407-
sb->s_bdi = &zsb->z_bdi;
14081406

14091407
error = -zpl_bdi_setup(sb, "zfs");
14101408
if (error)

0 commit comments

Comments
 (0)