LU-3674 ldiskfs: fix mb_groups column names

The ext4-mballoc-extra-checks.patch changes the mb_groups /proc file
to print out both the mballoc free blocks count and the group
descriptor free block count, but incorrectly modifies the column
headers.  Fix the headers to match the fields being printed.

Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Change-Id: Ia7cb2348cfa7a91ed37690bdbc8438834a3ebbe5
Reviewed-on: http://review.whamcloud.com/7187
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Alex Zhuravlev <alexey.zhuravlev@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>

diff --git a/ldiskfs/kernel_patches/patches/rhel6.3/ext4-mballoc-extra-checks.patch b/ldiskfs/kernel_patches/patches/rhel6.3/ext4-mballoc-extra-checks.patch
index 63eb530..91b728d 100644 (file)
--- a/ldiskfs/kernel_patches/patches/rhel6.3/ext4-mballoc-extra-checks.patch
+++ b/ldiskfs/kernel_patches/patches/rhel6.3/ext4-mballoc-extra-checks.patch
@@ -121,7 +121,7 @@ Index: linux-stage/fs/ext4/mballoc.c
                                "[ %-5s %-5s %-5s %-5s %-5s %-5s %-5s "
                                  "%-5s %-5s %-5s %-5s %-5s %-5s %-5s ]\n",
 -                         "group", "free", "frags", "first",
-+                         "group", "free", "frags", "first", "first", "pa",
++                         "group", "free", "free", "frags", "first", "pa",
                           "2^0", "2^1", "2^2", "2^3", "2^4", "2^5", "2^6",
                           "2^7", "2^8", "2^9", "2^10", "2^11", "2^12", "2^13");
  

diff --git a/ldiskfs/kernel_patches/patches/sles11sp2/ext4-mballoc-extra-checks.patch b/ldiskfs/kernel_patches/patches/sles11sp2/ext4-mballoc-extra-checks.patch
index 085a73e..59244b0 100644 (file)
--- a/ldiskfs/kernel_patches/patches/sles11sp2/ext4-mballoc-extra-checks.patch
+++ b/ldiskfs/kernel_patches/patches/sles11sp2/ext4-mballoc-extra-checks.patch
@@ -123,7 +123,7 @@
                                "[ %-5s %-5s %-5s %-5s %-5s %-5s %-5s "
                                  "%-5s %-5s %-5s %-5s %-5s %-5s %-5s ]\n",
 -                         "group", "free", "frags", "first",
-+                         "group", "free", "frags", "first", "first", "pa",
++                         "group", "free", "free", "frags", "first", "pa",
                           "2^0", "2^1", "2^2", "2^3", "2^4", "2^5", "2^6",
                           "2^7", "2^8", "2^9", "2^10", "2^11", "2^12", "2^13");