diff options
author | Manish Katiyar <mkatiyar@gmail.com> | 2008-10-17 14:58:45 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2008-10-17 14:58:45 -0400 |
commit | 0b09923eabd92f11a8b272dd3fd0347332d0e1e2 (patch) | |
tree | 20fbba154ab3b9e8c0c77549db17d6d71f86abe5 | |
parent | 5128273a326679970b9196a27ff812670927c1c4 (diff) |
ext4: Remove compile warnings when building w/o CONFIG_PROC_FS
Signed-off-by: Manish Katiyar <mkatiyar@gmail.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
-rw-r--r-- | fs/ext4/mballoc.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index 815a22ea6078..da1da1fe2b14 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c | |||
@@ -2720,6 +2720,7 @@ ext4_mb_free_committed_blocks(struct super_block *sb) | |||
2720 | 2720 | ||
2721 | static int ext4_mb_init_per_dev_proc(struct super_block *sb) | 2721 | static int ext4_mb_init_per_dev_proc(struct super_block *sb) |
2722 | { | 2722 | { |
2723 | #ifdef CONFIG_PROC_FS | ||
2723 | mode_t mode = S_IFREG | S_IRUGO | S_IWUSR; | 2724 | mode_t mode = S_IFREG | S_IRUGO | S_IWUSR; |
2724 | struct ext4_sb_info *sbi = EXT4_SB(sb); | 2725 | struct ext4_sb_info *sbi = EXT4_SB(sb); |
2725 | struct proc_dir_entry *proc; | 2726 | struct proc_dir_entry *proc; |
@@ -2743,10 +2744,14 @@ err_out: | |||
2743 | remove_proc_entry(EXT4_MB_MAX_TO_SCAN_NAME, sbi->s_proc); | 2744 | remove_proc_entry(EXT4_MB_MAX_TO_SCAN_NAME, sbi->s_proc); |
2744 | remove_proc_entry(EXT4_MB_STATS_NAME, sbi->s_proc); | 2745 | remove_proc_entry(EXT4_MB_STATS_NAME, sbi->s_proc); |
2745 | return -ENOMEM; | 2746 | return -ENOMEM; |
2747 | #else | ||
2748 | return 0; | ||
2749 | #endif | ||
2746 | } | 2750 | } |
2747 | 2751 | ||
2748 | static int ext4_mb_destroy_per_dev_proc(struct super_block *sb) | 2752 | static int ext4_mb_destroy_per_dev_proc(struct super_block *sb) |
2749 | { | 2753 | { |
2754 | #ifdef CONFIG_PROC_FS | ||
2750 | struct ext4_sb_info *sbi = EXT4_SB(sb); | 2755 | struct ext4_sb_info *sbi = EXT4_SB(sb); |
2751 | 2756 | ||
2752 | if (sbi->s_proc == NULL) | 2757 | if (sbi->s_proc == NULL) |
@@ -2758,7 +2763,7 @@ static int ext4_mb_destroy_per_dev_proc(struct super_block *sb) | |||
2758 | remove_proc_entry(EXT4_MB_MIN_TO_SCAN_NAME, sbi->s_proc); | 2763 | remove_proc_entry(EXT4_MB_MIN_TO_SCAN_NAME, sbi->s_proc); |
2759 | remove_proc_entry(EXT4_MB_MAX_TO_SCAN_NAME, sbi->s_proc); | 2764 | remove_proc_entry(EXT4_MB_MAX_TO_SCAN_NAME, sbi->s_proc); |
2760 | remove_proc_entry(EXT4_MB_STATS_NAME, sbi->s_proc); | 2765 | remove_proc_entry(EXT4_MB_STATS_NAME, sbi->s_proc); |
2761 | 2766 | #endif | |
2762 | return 0; | 2767 | return 0; |
2763 | } | 2768 | } |
2764 | 2769 | ||