From 9cac2b2ea641346c92e24e2a066a658f98ff1d94 Mon Sep 17 00:00:00 2001 From: Manish Katiyar Date: Fri, 17 Oct 2008 14:58:45 -0400 Subject: [PATCH] --- yaml --- r: 115587 b: refs/heads/master c: 0b09923eabd92f11a8b272dd3fd0347332d0e1e2 h: refs/heads/master i: 115585: e1f62a35c03a83e0ad4c1a464c33bd423406ae14 115583: 8990739e688e19b38b792e8eff862916e0dc0541 v: v3 --- [refs] | 2 +- trunk/fs/ext4/mballoc.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f40e1e879dd5..7e76f501bdae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5128273a326679970b9196a27ff812670927c1c4 +refs/heads/master: 0b09923eabd92f11a8b272dd3fd0347332d0e1e2 diff --git a/trunk/fs/ext4/mballoc.c b/trunk/fs/ext4/mballoc.c index 815a22ea6078..da1da1fe2b14 100644 --- a/trunk/fs/ext4/mballoc.c +++ b/trunk/fs/ext4/mballoc.c @@ -2720,6 +2720,7 @@ ext4_mb_free_committed_blocks(struct super_block *sb) static int ext4_mb_init_per_dev_proc(struct super_block *sb) { +#ifdef CONFIG_PROC_FS mode_t mode = S_IFREG | S_IRUGO | S_IWUSR; struct ext4_sb_info *sbi = EXT4_SB(sb); struct proc_dir_entry *proc; @@ -2743,10 +2744,14 @@ static int ext4_mb_init_per_dev_proc(struct super_block *sb) remove_proc_entry(EXT4_MB_MAX_TO_SCAN_NAME, sbi->s_proc); remove_proc_entry(EXT4_MB_STATS_NAME, sbi->s_proc); return -ENOMEM; +#else + return 0; +#endif } static int ext4_mb_destroy_per_dev_proc(struct super_block *sb) { +#ifdef CONFIG_PROC_FS struct ext4_sb_info *sbi = EXT4_SB(sb); if (sbi->s_proc == NULL) @@ -2758,7 +2763,7 @@ static int ext4_mb_destroy_per_dev_proc(struct super_block *sb) remove_proc_entry(EXT4_MB_MIN_TO_SCAN_NAME, sbi->s_proc); remove_proc_entry(EXT4_MB_MAX_TO_SCAN_NAME, sbi->s_proc); remove_proc_entry(EXT4_MB_STATS_NAME, sbi->s_proc); - +#endif return 0; }