diff --git a/[refs] b/[refs] index f3f1d2b8624a..0fec346a2c6b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5bf5683a33f3584da6eced480967c4f7e11515a8 +refs/heads/master: 3244fcb1ae03362e4aa8cb1a9039fbfd61661859 diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c index 014677b8e224..fb940c22ab0d 100644 --- a/trunk/fs/ext4/super.c +++ b/trunk/fs/ext4/super.c @@ -2231,6 +2231,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) goto failed_mount; } +#ifdef CONFIG_PROC_FS if (ext4_proc_root) sbi->s_proc = proc_mkdir(sb->s_id, ext4_proc_root); @@ -2238,6 +2239,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) proc_create_data("inode_readahead_blks", 0644, sbi->s_proc, &ext4_ui_proc_fops, &sbi->s_inode_readahead_blks); +#endif bgl_lock_init(&sbi->s_blockgroup_lock);