From 027bf713f9d4c3df52d89786ebeab6e8b3e234b5 Mon Sep 17 00:00:00 2001 From: Salman Qazi Date: Thu, 31 May 2012 23:52:14 -0400 Subject: [PATCH] --- yaml --- r: 309971 b: refs/heads/master c: 95599968d19db175829fb580baa6b68939b320fb h: refs/heads/master i: 309969: 1d409b9bff6db50d8be7736f41ccd3c39e7a3b5a 309967: f12b29ac6c9be7707c0a6ea25d7a49b31a4559c3 v: v3 --- [refs] | 2 +- trunk/fs/ext4/mballoc.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5205076d8346..dac480c7eb78 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 02b7831019ea4e7994968c84b5826fa8b248ffc8 +refs/heads/master: 95599968d19db175829fb580baa6b68939b320fb diff --git a/trunk/fs/ext4/mballoc.c b/trunk/fs/ext4/mballoc.c index 3d9277c48bc8..1cd6994fc446 100644 --- a/trunk/fs/ext4/mballoc.c +++ b/trunk/fs/ext4/mballoc.c @@ -2517,6 +2517,9 @@ int ext4_mb_release(struct super_block *sb) struct ext4_sb_info *sbi = EXT4_SB(sb); struct kmem_cache *cachep = get_groupinfo_cache(sb->s_blocksize_bits); + if (sbi->s_proc) + remove_proc_entry("mb_groups", sbi->s_proc); + if (sbi->s_group_info) { for (i = 0; i < ngroups; i++) { grinfo = ext4_get_group_info(sb, i); @@ -2564,8 +2567,6 @@ int ext4_mb_release(struct super_block *sb) } free_percpu(sbi->s_locality_groups); - if (sbi->s_proc) - remove_proc_entry("mb_groups", sbi->s_proc); return 0; }