Merge branch 'smsc911x-armplatforms' of git://github.com/steveglen/linux-2.6

1 files changed, 11 insertions, 11 deletions

diff --git a/fs/reiserfs/ibalance.c b/fs/reiserfs/ibalance.c
index de391a82b999..2074fd95046b 100644
--- a/fs/reiserfs/ibalance.c
+++ b/fs/reiserfs/ibalance.c
@@ -105,8 +105,8 @@ static void internal_define_dest_src_infos(int shift_mode,
                 break;
 
         default:
-                reiserfs_panic(tb->tb_sb,
-                               "internal_define_dest_src_infos: shift type is unknown (%d)",
+                reiserfs_panic(tb->tb_sb, "ibalance-1",
+                               "shift type is unknown (%d)",
                                shift_mode);
         }
 }
@@ -278,7 +278,7 @@ static void internal_delete_childs(struct buffer_info *cur_bi, int from, int n)
 
 /* copy cpy_num node pointers and cpy_num - 1 items from buffer src to buffer dest
 * last_first == FIRST_TO_LAST means, that we copy first items from src to tail of dest
- * last_first == LAST_TO_FIRST means, that we copy last items from src to head of dest 
+ * last_first == LAST_TO_FIRST means, that we copy last items from src to head of dest
  */
 static void internal_copy_pointers_items(struct buffer_info *dest_bi,
                                          struct buffer_head *src,
@@ -385,7 +385,7 @@ static void internal_move_pointers_items(struct buffer_info *dest_bi,
         if (last_first == FIRST_TO_LAST) {      /* shift_left occurs */
                 first_pointer = 0;
                 first_item = 0;
-                /* delete cpy_num - del_par pointers and keys starting for pointers with first_pointer, 
+                /* delete cpy_num - del_par pointers and keys starting for pointers with first_pointer,
                    for key - with first_item */
                 internal_delete_pointers_items(src_bi, first_pointer,
                                                first_item, cpy_num - del_par);
@@ -453,7 +453,7 @@ static void internal_insert_key(struct buffer_info *dest_bi, int dest_position_b
         }
 }
 
-/* Insert d_key'th (delimiting) key from buffer cfl to tail of dest. 
+/* Insert d_key'th (delimiting) key from buffer cfl to tail of dest.
  * Copy pointer_amount node pointers and pointer_amount - 1 items from buffer src to buffer dest.
  * Replace  d_key'th key in buffer cfl.
  * Delete pointer_amount items and node pointers from buffer src.
@@ -518,7 +518,7 @@ static void internal_shift1_left(struct tree_balance *tb,
         /*    internal_move_pointers_items (tb->L[h], tb->S[h], FIRST_TO_LAST, pointer_amount, 1); */
 }
 
-/* Insert d_key'th (delimiting) key from buffer cfr to head of dest. 
+/* Insert d_key'th (delimiting) key from buffer cfr to head of dest.
  * Copy n node pointers and n - 1 items from buffer src to buffer dest.
  * Replace  d_key'th key in buffer cfr.
  * Delete n items and node pointers from buffer src.
@@ -702,8 +702,8 @@ static void balance_internal_when_delete(struct tree_balance *tb,
 
                 return;
         }
-        reiserfs_panic(tb->tb_sb,
-                       "balance_internal_when_delete: unexpected tb->lnum[%d]==%d or tb->rnum[%d]==%d",
+        reiserfs_panic(tb->tb_sb, "ibalance-2",
+                       "unexpected tb->lnum[%d]==%d or tb->rnum[%d]==%d",
                        h, tb->lnum[h], h, tb->rnum[h]);
 }
 
@@ -749,7 +749,7 @@ int balance_internal(struct tree_balance *tb,	/* tree_balance structure
        this means that new pointers and items must be inserted AFTER *
        child_pos
        }
-       else 
+       else
        {
        it is the position of the leftmost pointer that must be deleted (together with
        its corresponding key to the left of the pointer)
@@ -940,8 +940,8 @@ int balance_internal(struct tree_balance *tb,	/* tree_balance structure
                 struct block_head *blkh;
 
                 if (tb->blknum[h] != 1)
-                        reiserfs_panic(NULL,
-                                       "balance_internal: One new node required for creating the new root");
+                        reiserfs_panic(NULL, "ibalance-3", "One new node "
+                                       "required for creating the new root");
                 /* S[h] = empty buffer from the list FEB. */
                 tbSh = get_FEB(tb);
                 blkh = B_BLK_HEAD(tbSh);