Branch b1_4

Fix compile warning.

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 36b4c5d..d38fb54 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6-suse.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-mballoc2-2.6-suse.patch
@@ -2,7 +2,7 @@ Index: linux-2.6.5-suse/fs/ext3/mballoc.c
 ===================================================================
 --- linux-2.6.5-suse.orig/fs/ext3/mballoc.c    2005-03-02 22:42:20.659360368 +0300
 +++ linux-2.6.5-suse/fs/ext3/mballoc.c 2005-03-11 16:13:13.000000000 +0300
-@@ -0,0 +1,1863 @@
+@@ -0,0 +1,1864 @@
 +/*
 + * Copyright(c) 2003, 2004, 2005, Cluster File Systems, Inc, info@clusterfs.com
 + * Written by Alex Tomas <alex@clusterfs.com>
@@ -932,7 +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_warning(inode->i_sb,"too long searching: got %d want %d\n",
++              ext3_warning(inode->i_sb, __FUNCTION__,
++                           "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 1fb2b56..24b2595 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
@@ -2,7 +2,7 @@ Index: linux-stage/fs/ext3/mballoc.c
 ===================================================================
 --- linux-stage.orig/fs/ext3/mballoc.c 2005-02-25 17:28:41.836311072 +0200
 +++ linux-stage/fs/ext3/mballoc.c      2005-02-25 17:28:41.859307576 +0200
-@@ -0,0 +1,1860 @@
+@@ -0,0 +1,1861 @@
 +/*
 + * Copyright (c) 2003, Cluster File Systems, Inc, info@clusterfs.com
 + * Written by Alex Tomas <alex@clusterfs.com>
@@ -932,7 +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_warning(inode->i_sb,"too long searching: got %d want %d\n",
++              ext3_warning(inode->i_sb, __FUNCTION__,
++                           "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 36b4c5d..d38fb54 100644 (file)
--- a/lustre/kernel_patches/patches/ext3-mballoc2-2.6-suse.patch
+++ b/lustre/kernel_patches/patches/ext3-mballoc2-2.6-suse.patch
@@ -2,7 +2,7 @@ Index: linux-2.6.5-suse/fs/ext3/mballoc.c
 ===================================================================
 --- linux-2.6.5-suse.orig/fs/ext3/mballoc.c    2005-03-02 22:42:20.659360368 +0300
 +++ linux-2.6.5-suse/fs/ext3/mballoc.c 2005-03-11 16:13:13.000000000 +0300
-@@ -0,0 +1,1863 @@
+@@ -0,0 +1,1864 @@
 +/*
 + * Copyright(c) 2003, 2004, 2005, Cluster File Systems, Inc, info@clusterfs.com
 + * Written by Alex Tomas <alex@clusterfs.com>
@@ -932,7 +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_warning(inode->i_sb,"too long searching: got %d want %d\n",
++              ext3_warning(inode->i_sb, __FUNCTION__,
++                           "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 1fb2b56..24b2595 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
@@ -2,7 +2,7 @@ Index: linux-stage/fs/ext3/mballoc.c
 ===================================================================
 --- linux-stage.orig/fs/ext3/mballoc.c 2005-02-25 17:28:41.836311072 +0200
 +++ linux-stage/fs/ext3/mballoc.c      2005-02-25 17:28:41.859307576 +0200
-@@ -0,0 +1,1860 @@
+@@ -0,0 +1,1861 @@
 +/*
 + * Copyright (c) 2003, Cluster File Systems, Inc, info@clusterfs.com
 + * Written by Alex Tomas <alex@clusterfs.com>
@@ -932,7 +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_warning(inode->i_sb,"too long searching: got %d want %d\n",
++              ext3_warning(inode->i_sb, __FUNCTION__,
++                           "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) {