diff -uNr linux-2.4.18.o/fs/reiserfs/prints.c linux-2.4.18/fs/reiserfs/prints.c
--- linux-2.4.18.o/fs/reiserfs/prints.c Wed Feb 27 11:52:05 2002
+++ linux-2.4.18/fs/reiserfs/prints.c   Wed Feb 27 12:02:31 2002
@@ -477,6 +477,17 @@
    return 0;
}

+char * reiserfs_hashname(int code)
+{
+    if ( code == YURA_HASH)
+       return "rupasov";
+    if ( code == TEA_HASH)
+       return "tea";
+    if ( code == R5_HASH)
+       return "r5";
+
+    return "unknown";
+}
/* return 1 if this is not super block */
static int print_super_block (struct buffer_head * bh)
{
@@ -519,8 +530,7 @@
    printk ("Filesystem state %s\n",
           (sb_state(rs) == REISERFS_VALID_FS) ? "VALID" : "ERROR");
    printk ("Hash function \"%s\"\n",
-            sb_hash_function_code(rs) == TEA_HASH ? "tea" :
-           ( sb_hash_function_code(rs) == YURA_HASH ? "rupasov" : (sb_hash_function_code(rs) == R5_HASH ? "r5" : "unknown")));
+            reiserfs_hashname(sb_hash_function_code(rs)));

    printk ("Tree height %d\n", sb_tree_height(rs));
    return 0;
diff -uNr linux-2.4.18.o/fs/reiserfs/super.c linux-2.4.18/fs/reiserfs/super.c
--- linux-2.4.18.o/fs/reiserfs/super.c  Wed Feb 27 11:52:05 2002
+++ linux-2.4.18/fs/reiserfs/super.c    Wed Feb 27 12:05:14 2002
@@ -791,7 +791,9 @@

    inode = s->s_root->d_inode;

-    while (1) {
+    do { // Some serious "goto"-hater was there ;)
+       u32 teahash, r5hash, yurahash;
+
       make_cpu_key (&key, inode, ~0, TYPE_DIRENTRY, 3);
       retval = search_by_entry_key (s, &key, &path, &de);
       if (retval == IO_ERROR) {
@@ -810,20 +812,30 @@
                            "is using the default hash\n");
           break;
       }
-       if (GET_HASH_VALUE(yura_hash (de.de_name, de.de_namelen)) ==
-           GET_HASH_VALUE(keyed_hash (de.de_name, de.de_namelen))) {
-           reiserfs_warning ("reiserfs: Could not detect hash function "
-                             "please mount with -o hash={tea,rupasov,r5}\n") ;
-           hash = UNSET_HASH ;
+       r5hash=GET_HASH_VALUE (r5_hash (de.de_name, de.de_namelen));
+       teahash=GET_HASH_VALUE (keyed_hash (de.de_name, de.de_namelen));
+       yurahash=GET_HASH_VALUE (yura_hash (de.de_name, de.de_namelen));
+       if ( ( (teahash == r5hash) && (GET_HASH_VALUE( deh_offset(&(de.de_deh[de.de_entry_num]))) == r5hash) ) ||
+            ( (teahash == yurahash) && (yurahash == GET_HASH_VALUE( deh_offset(&(de.de_deh[de.de_entry_num])))) ) ||
+            ( (r5hash == yurahash) && (yurahash == GET_HASH_VALUE( deh_offset(&(de.de_deh[de.de_entry_num])))) ) ) {
+           reiserfs_warning("reiserfs: Unable to automatically detect hash"
+               "function for device %s\n"
+               "please mount with -o hash={tea,rupasov,r5}\n", kdevname (s->s_dev));
+           hash = UNSET_HASH;
           break;
       }
-       if (GET_HASH_VALUE( deh_offset(&(de.de_deh[de.de_entry_num])) ) ==
-           GET_HASH_VALUE (yura_hash (de.de_name, de.de_namelen)))
+       if (GET_HASH_VALUE( deh_offset(&(de.de_deh[de.de_entry_num])) ) == yurahash)
           hash = YURA_HASH;
-       else
+       else if (GET_HASH_VALUE( deh_offset(&(de.de_deh[de.de_entry_num])) ) == teahash)
           hash = TEA_HASH;
-       break;
-    }
+       else if (GET_HASH_VALUE( deh_offset(&(de.de_deh[de.de_entry_num])) ) == r5hash)
+           hash = R5_HASH;
+       else {
+           reiserfs_warning("reiserfs: Unrecognised hash function for "
+                            "device %s\n", kdevname (s->s_dev));
+           hash = UNSET_HASH;
+       }
+    } while (0);

    pathrelse (&path);
    return hash;
@@ -848,16 +860,16 @@
       ** mount options
       */
       if (reiserfs_rupasov_hash(s) && code != YURA_HASH) {
-           printk("REISERFS: Error, tea hash detected, "
-                  "unable to force rupasov hash\n") ;
+           printk("REISERFS: Error, %s hash detected, "
+                  "unable to force rupasov hash\n", reiserfs_hashname(code)) ;
           code = UNSET_HASH ;
       } else if (reiserfs_tea_hash(s) && code != TEA_HASH) {
-           printk("REISERFS: Error, rupasov hash detected, "
-                  "unable to force tea hash\n") ;
+           printk("REISERFS: Error, %s hash detected, "
+                  "unable to force tea hash\n", reiserfs_hashname(code)) ;
           code = UNSET_HASH ;
       } else if (reiserfs_r5_hash(s) && code != R5_HASH) {
-           printk("REISERFS: Error, r5 hash detected, "
-                  "unable to force r5 hash\n") ;
+           printk("REISERFS: Error, %s hash detected, "
+                  "unable to force r5 hash\n", reiserfs_hashname(code)) ;
           code = UNSET_HASH ;
       }
    } else {
diff -uNr linux-2.4.18.o/include/linux/reiserfs_fs.h linux-2.4.18/include/linux/reiserfs_fs.h
--- linux-2.4.18.o/include/linux/reiserfs_fs.h  Wed Feb 27 12:00:57 2002
+++ linux-2.4.18/include/linux/reiserfs_fs.h    Wed Feb 27 12:02:31 2002
@@ -1843,6 +1843,7 @@
void check_leaf (struct buffer_head * bh);
void check_internal (struct buffer_head * bh);
void print_statistics (struct super_block * s);
+char * reiserfs_hashname(int code);

/* lbalance.c */
int leaf_move_items (int shift_mode, struct tree_balance * tb, int mov_num, int mov_bytes, struct buffer_head * Snew);

You are viewing proxied material from ftp.icm.edu.pl. The copyright of proxied material belongs to its original authors. Any comments or complaints in relation to proxied material should be directed to the original authors of the content concerned. Please see the disclaimer for more details.