Branch b1_4

Restore the "too long searching" message as a warning (though not an error).
b=6449

diff --git a/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6-suse.patch b/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6-suse.patch
index cd6a3ad..36b4c5d 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6-suse.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6-suse.patch
@@ -932,8 +932,8 @@ Index: linux-2.6.5-suse/fs/ext3/mballoc.c
 +               * We've been searching too long. Let's try to allocate
 +               * the best chunk we've found so far
 +               */
-+              ext3_debug("too long searching (%d/%d)\n",
-+                              ac.ac_b_ex.fe_len, ac.ac_g_ex.fe_len);
++              ext3_warning(inode->i_sb,"too long searching: got %d want %d\n",
++                           ac.ac_b_ex.fe_len, ac.ac_g_ex.fe_len);
 +              ext3_mb_try_best_found(&ac, &e3b);
 +              if (ac.ac_status != AC_STATUS_FOUND) {
 +                      /*

diff --git a/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6.9-rhel4.patch b/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6.9-rhel4.patch
index c49605f..1fb2b56 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6.9-rhel4.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6.9-rhel4.patch
@@ -932,8 +932,8 @@ Index: linux-stage/fs/ext3/mballoc.c
 +               * We've been searching too long. Let's try to allocate
 +               * the best chunk we've found so far
 +               */
-+              ext3_debug("too long searching (%d/%d)\n",
-+                              ac.ac_b_ex.fe_len, ac.ac_g_ex.fe_len);
++              ext3_warning(inode->i_sb,"too long searching: got %d want %d\n",
++                           ac.ac_b_ex.fe_len, ac.ac_g_ex.fe_len);
 +              ext3_mb_try_best_found(&ac, &e3b);
 +              if (ac.ac_status != AC_STATUS_FOUND) {
 +                      /*

diff --git a/lustre/kernel_patches/patches/ext3-mballoc2-2.6-suse.patch b/lustre/kernel_patches/patches/ext3-mballoc2-2.6-suse.patch
index cd6a3ad..36b4c5d 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-mballoc2-2.6-suse.patch
+++ b/lustre/kernel_patches/patches/ext3-mballoc2-2.6-suse.patch
@@ -932,8 +932,8 @@ Index: linux-2.6.5-suse/fs/ext3/mballoc.c
 +               * We've been searching too long. Let's try to allocate
 +               * the best chunk we've found so far
 +               */
-+              ext3_debug("too long searching (%d/%d)\n",
-+                              ac.ac_b_ex.fe_len, ac.ac_g_ex.fe_len);
++              ext3_warning(inode->i_sb,"too long searching: got %d want %d\n",
++                           ac.ac_b_ex.fe_len, ac.ac_g_ex.fe_len);
 +              ext3_mb_try_best_found(&ac, &e3b);
 +              if (ac.ac_status != AC_STATUS_FOUND) {
 +                      /*

diff --git a/lustre/kernel_patches/patches/ext3-mballoc2-2.6.9-rhel4.patch b/lustre/kernel_patches/patches/ext3-mballoc2-2.6.9-rhel4.patch
index c49605f..1fb2b56 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-mballoc2-2.6.9-rhel4.patch
+++ b/lustre/kernel_patches/patches/ext3-mballoc2-2.6.9-rhel4.patch
@@ -932,8 +932,8 @@ Index: linux-stage/fs/ext3/mballoc.c
 +               * We've been searching too long. Let's try to allocate
 +               * the best chunk we've found so far
 +               */
-+              ext3_debug("too long searching (%d/%d)\n",
-+                              ac.ac_b_ex.fe_len, ac.ac_g_ex.fe_len);
++              ext3_warning(inode->i_sb,"too long searching: got %d want %d\n",
++                           ac.ac_b_ex.fe_len, ac.ac_g_ex.fe_len);
 +              ext3_mb_try_best_found(&ac, &e3b);
 +              if (ac.ac_status != AC_STATUS_FOUND) {
 +                      /*