1 Index: linux-2.6.18-128.1.6/fs/ext4/mballoc.c
2 ===================================================================
3 --- linux-2.6.18-128.1.6.orig/fs/ext4/mballoc.c 2009-05-29 16:32:19.000000000 +0530
4 +++ linux-2.6.18-128.1.6/fs/ext4/mballoc.c 2009-05-29 16:34:16.000000000 +0530
5 @@ -2949,14 +2949,20 @@
6 struct ext4_sb_info *sbi = EXT4_SB(sb);
7 struct proc_dir_entry *proc;
8 struct proc_dir_entry *proc_entry;
10 + char devname[BDEVNAME_SIZE], *p;
12 if (proc_root_ext4 == NULL) {
13 sbi->s_mb_proc = NULL;
16 bdevname(sb->s_bdev, devname);
18 + while ((p = strchr(p, '/')))
21 sbi->s_mb_proc = proc_mkdir(devname, proc_root_ext4);
22 + if (!sbi->s_mb_proc)
23 + goto err_create_dir;
25 MB_PROC_HANDLER(EXT4_MB_STATS_NAME, stats);
26 MB_PROC_HANDLER(EXT4_MB_MAX_TO_SCAN_NAME, max_to_scan);
31 - printk(KERN_ERR "EXT4-fs: Unable to create %s\n", devname);
32 remove_proc_entry(EXT4_MB_GROUP_PREALLOC, sbi->s_mb_proc);
33 remove_proc_entry(EXT4_MB_PREALLOC_TABLE, sbi->s_mb_proc);
34 remove_proc_entry(EXT4_MB_LARGE_REQ, sbi->s_mb_proc);
35 @@ -2993,18 +2998,23 @@
36 remove_proc_entry(devname, proc_root_ext4);
37 sbi->s_mb_proc = NULL;
40 + printk(KERN_ERR "EXT4-fs: Unable to create %s\n", devname);
44 static int ext4_mb_destroy_per_dev_proc(struct super_block *sb)
46 struct ext4_sb_info *sbi = EXT4_SB(sb);
48 + char devname[BDEVNAME_SIZE], *p;
50 if (sbi->s_mb_proc == NULL)
53 bdevname(sb->s_bdev, devname);
55 + while ((p = strchr(p, '/')))
57 remove_proc_entry(EXT4_MB_GROUP_PREALLOC, sbi->s_mb_proc);
58 remove_proc_entry(EXT4_MB_PREALLOC_TABLE, sbi->s_mb_proc);
59 remove_proc_entry(EXT4_MB_LARGE_REQ, sbi->s_mb_proc);