[PATCH] reiserfs patchset, patch 3 of 9 03-key_output_fix.diff

03-key_output_fix.diff
    Fix all the places where cpu key is attempted to be printed as ondisk key

diff --git a/fs/reiserfs/dir.c b/fs/reiserfs/dir.c
index ca9393ea55972662a26a4b73fd5cc6ef079f2423..fcc59fddf2e779e3d6f02e53da9ca1bf3a4cf8ba 100644 (file)
--- a/fs/reiserfs/dir.c
+++ b/fs/reiserfs/dir.c
@@ -76,7 +76,7 @@ static int reiserfs_readdir (struct file * filp, void * dirent, filldir_t filldi
                
        /* we must have found item, that is item of this directory, */
        RFALSE( COMP_SHORT_KEYS (&(ih->ih_key), &pos_key),
-               "vs-9000: found item %h does not match to dir we readdir %k",
+               "vs-9000: found item %h does not match to dir we readdir %K",
                ih, &pos_key);
        RFALSE( item_num > B_NR_ITEMS (bh) - 1,
                "vs-9005 item_num == %d, item amount == %d", 

diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c
index 6eeec494090f4df2edb7233658c4913b4a35ef97..9d2d24bd1136c687edd4aabc29fe4fba8ee4de42 100644 (file)
--- a/fs/reiserfs/namei.c
+++ b/fs/reiserfs/namei.c
@@ -470,7 +470,7 @@ static int reiserfs_add_entry (struct reiserfs_transaction_handle *th, struct in
     if (gen_number != 0) {     /* we need to re-search for the insertion point */
       if (search_by_entry_key (dir->i_sb, &entry_key, &path, &de) != NAME_NOT_FOUND) {
             reiserfs_warning ("vs-7032: reiserfs_add_entry: "
-                            "entry with this key (%k) already exists\n", &entry_key);
+                            "entry with this key (%K) already exists\n", &entry_key);
 
            if (buffer != small_buf)
                reiserfs_kfree (buffer, buflen, dir->i_sb);

diff --git a/fs/reiserfs/stree.c b/fs/reiserfs/stree.c
index 00c4c8e72381f12f6743fd4293d83f043b9ecdb2..dbb515c33e3793a158f3985aa63fa0cda81dd755 100644 (file)
--- a/fs/reiserfs/stree.c
+++ b/fs/reiserfs/stree.c
@@ -166,7 +166,7 @@ inline int comp_cpu_keys (const struct cpu_key * key1,
     if (cpu_key_k_offset (key1) > cpu_key_k_offset (key2))
        return 1;
 
-    reiserfs_warning ("comp_cpu_keys: type are compared for %k and %k\n",
+    reiserfs_warning ("comp_cpu_keys: type are compared for %K and %K\n",
                      key1, key2);
 
     if (cpu_key_k_type (key1) < cpu_key_k_type (key2))
@@ -1522,7 +1522,7 @@ int reiserfs_cut_from_item (struct reiserfs_transaction_handle *th,
            set_cpu_key_k_offset (p_s_item_key, n_new_file_size + 1);
            if ( search_for_position_by_key(p_s_sb, p_s_item_key, p_s_path) == POSITION_NOT_FOUND ){
                print_block (PATH_PLAST_BUFFER (p_s_path), 3, PATH_LAST_POSITION (p_s_path) - 1, PATH_LAST_POSITION (p_s_path) + 1);
-               reiserfs_panic(p_s_sb, "PAP-5580: reiserfs_cut_from_item: item to convert does not exist (%k)", p_s_item_key);
+               reiserfs_panic(p_s_sb, "PAP-5580: reiserfs_cut_from_item: item to convert does not exist (%K)", p_s_item_key);
            }
            continue;
        }
@@ -1716,7 +1716,7 @@ void reiserfs_do_truncate (struct reiserfs_transaction_handle *th,
        }
 
        RFALSE( n_deleted > n_file_size,
-               "PAP-5670: reiserfs_truncate_file returns too big number: deleted %d, file_size %lu, item_key %k",
+               "PAP-5670: reiserfs_truncate_file returns too big number: deleted %d, file_size %lu, item_key %K",
                n_deleted, n_file_size, &s_item_key);
 
        /* Change key to search the last file item. */

diff --git a/fs/reiserfs/tail_conversion.c b/fs/reiserfs/tail_conversion.c
index 3d83a5696f2a078a2855d60246e0676445a17644..18f1bda12d0e9a735053a1994e55853ba3432e1f 100644 (file)
--- a/fs/reiserfs/tail_conversion.c
+++ b/fs/reiserfs/tail_conversion.c
@@ -90,10 +90,10 @@ int direct2indirect (struct reiserfs_transaction_handle *th, struct inode * inod
            last item of the file */
        if ( search_for_position_by_key (sb, &end_key, path) == POSITION_FOUND )
            reiserfs_panic (sb, "PAP-14050: direct2indirect: "
-                           "direct item (%k) not found", &end_key);
+                           "direct item (%K) not found", &end_key);
        p_le_ih = PATH_PITEM_HEAD (path);
        RFALSE( !is_direct_le_ih (p_le_ih),
-               "vs-14055: direct item expected(%k), found %h",
+               "vs-14055: direct item expected(%K), found %h",
                 &end_key, p_le_ih);
         tail_size = (le_ih_k_offset (p_le_ih) & (n_blk_size - 1))
             + ih_item_len(p_le_ih) - 1;
@@ -228,7 +228,7 @@ int indirect2direct (struct reiserfs_transaction_handle *th,
        /* re-search indirect item */
        if ( search_for_position_by_key (p_s_sb, p_s_item_key, p_s_path) == POSITION_NOT_FOUND )
            reiserfs_panic(p_s_sb, "PAP-5520: indirect2direct: "
-                          "item to be converted %k does not exist", p_s_item_key);
+                          "item to be converted %K does not exist", p_s_item_key);
        copy_item_head(&s_ih, PATH_PITEM_HEAD(p_s_path));
 #ifdef CONFIG_REISERFS_CHECK
        pos = le_ih_k_offset (&s_ih) - 1 +