diff -u -r linux/fs/reiserfs/journal.c linux-patched/fs/reiserfs/journal.c
--- linux/fs/reiserfs/journal.c Mon Jan 28 17:06:32 2002
+++ linux-patched/fs/reiserfs/journal.c Mon Jan 28 17:03:26 2002
@@ -1887,7 +1887,7 @@
       journal -> j_dev_file = NULL;
    }
    if( result != 0 ) {
-       reiserfs_warning("release_journal_dev: Cannot release journal device: %i", result );
+       reiserfs_warning("sh-457: release_journal_dev: Cannot release journal device: %i", result );
    }
    return result;
}
@@ -1917,7 +1917,7 @@
               else
                       result = -ENOMEM;
               if( result != 0 )
-                       printk( "journal_init_dev: cannot init journal device\n '%s': %i",
+                       printk( "sh-458: journal_init_dev: cannot init journal device\n '%s': %i",
                               kdevname( jdev ), result );

               return result;
@@ -1994,7 +1994,7 @@
                                            REISERFS_DISK_OFFSET_IN_BYTES / p_s_sb->s_blocksize + 2);

    if( journal_init_dev( p_s_sb, journal, j_dev_name ) != 0 ) {
-      printk( "journal-1259: unable to initialize jornal device\n");
+      printk( "sh-462: unable to initialize jornal device\n");
      return 1;
    }

@@ -2005,7 +2005,7 @@
                  SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb) + SB_ONDISK_JOURNAL_SIZE(p_s_sb),
                  SB_BLOCKSIZE(p_s_sb));
     if (!bhjh) {
-        printk("journal-1250: unable to read  journal header\n") ;
+        printk("sh-459: unable to read  journal header\n") ;
        return 1 ;
     }
     jh = (struct reiserfs_journal_header *)(bhjh->b_data);
@@ -2017,7 +2017,7 @@

        strcpy( jname, kdevname( SB_JOURNAL_DEV(p_s_sb) ) );
        strcpy( fname, kdevname( p_s_sb->s_dev ) );
-        printk("journal-460: journal header magic %x (device %s) does not match "
+        printk("sh-460: journal header magic %x (device %s) does not match "
               "to magic found in super block %x (device %s)\n",
               jh->jh_journal.jp_journal_magic, jname,
               sb_jp_journal_magic(rs), fname);
@@ -2046,7 +2046,7 @@
      SB_JOURNAL_TRANS_MAX(p_s_sb) = JOURNAL_TRANS_MIN_DEFAULT / ratio;

    if (SB_JOURNAL_TRANS_MAX(p_s_sb) != initial)
-      printk ("reiserfs warning: wrong transaction max size (%u). Changed to %u\n",
+      printk ("sh-461: journal_init: wrong transaction max size (%u). Changed to %u\n",
             initial, SB_JOURNAL_TRANS_MAX(p_s_sb));

    SB_JOURNAL_MAX_BATCH(p_s_sb) = SB_JOURNAL_TRANS_MAX(p_s_sb)*
@@ -2067,9 +2067,12 @@
      SB_JOURNAL_MAX_BATCH(p_s_sb) = (SB_JOURNAL_TRANS_MAX(p_s_sb)) * 9 / 10 ;
    }
  }
-  printk ("Journal params: device %s, size %u, journal first block %u, max trans len %u, max batch %u, "
+  printk ("Reiserfs journal params: device %s, size %u, "
+         "journal first block %u, max trans len %u, max batch %u, "
         "max commit age %u, max trans age %u\n",
-         kdevname( SB_JOURNAL_DEV(p_s_sb) ), SB_ONDISK_JOURNAL_SIZE(p_s_sb), SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb),
+         kdevname( SB_JOURNAL_DEV(p_s_sb) ),
+         SB_ONDISK_JOURNAL_SIZE(p_s_sb),
+         SB_ONDISK_JOURNAL_1st_BLOCK(p_s_sb),
         SB_JOURNAL_TRANS_MAX(p_s_sb),
         SB_JOURNAL_MAX_BATCH(p_s_sb),
         SB_JOURNAL_MAX_COMMIT_AGE(p_s_sb),
diff -u -r linux/fs/reiserfs/super.c linux-patched/fs/reiserfs/super.c
--- linux/fs/reiserfs/super.c   Mon Jan 28 17:06:53 2002
+++ linux-patched/fs/reiserfs/super.c   Mon Jan 28 15:32:36 2002
@@ -712,7 +712,7 @@

    bh = sb_bread (s, offset / s->s_blocksize);
    if (!bh) {
-      printk ("read_super_block: "
+      printk ("sh-2006: read_super_block: "
              "bread failed (dev %s, block %lu, size %lu)\n",
              s->s_id, offset / s->s_blocksize, s->s_blocksize);
      return 1;
@@ -720,9 +720,6 @@

    rs = (struct reiserfs_super_block *)bh->b_data;
    if (!is_any_reiserfs_magic_string (rs)) {
-      printk ("read_super_block: "
-              "can't find a reiserfs filesystem on (dev %s, block %lu, size %lu)\n",
-              s->s_id, bh->b_blocknr, s->s_blocksize);
      brelse (bh);
      return 1;
    }
@@ -733,22 +730,21 @@
    brelse (bh);

    sb_set_blocksize (s, sb_blocksize(rs));
-
+
    bh = reiserfs_bread (s, offset / s->s_blocksize);
    if (!bh) {
-       printk("read_super_block: "
+       printk("sh-2007: read_super_block: "
                "bread failed (dev %s, block %lu, size %lu)\n",
                s->s_id, offset / s->s_blocksize, s->s_blocksize);
       return 1;
    }

    rs = (struct reiserfs_super_block *)bh->b_data;
-    if (!is_any_reiserfs_magic_string (rs) || sb_blocksize(rs) != s->s_blocksize) {
-       printk ("read_super_block: "
+    if (sb_blocksize(rs) != s->s_blocksize) {
+       printk ("sh-2011: read_super_block: "
               "can't find a reiserfs filesystem on (dev %s, block %lu, size %lu)\n",
               s->s_id, bh->b_blocknr, s->s_blocksize);
       brelse (bh);
-       printk ("read_super_block: can't find a reiserfs filesystem on dev %s.\n", s->s_id);
       return 1;
    }

@@ -759,20 +755,22 @@
       /* magic is of non-standard journal filesystem, look at s_version to
          find which format is in use */
       if (sb_version(rs) == REISERFS_VERSION_2)
-           printk ("reiserfs: found format \"3.6\" with non-standard journal\n");
+         printk ("read_super_block: found reiserfs format \"3.6\" "
+                 "with non-standard journal\n");
       else if (sb_version(rs) == REISERFS_VERSION_1)
-           printk ("reiserfs: found format \"3.5\" with non-standard journal\n");
+         printk ("read_super_block: found reiserfs format \"3.5\" "
+                 "with non-standard journal\n");
       else {
-           printk ("read_super_block: found unknown format \"%u\" "
-                   "with non-standard magic\n", sb_version(rs));
+         printk ("sh-2012: read_super_block: found unknown format \"%u\" "
+                   "of reiserfs with non-standard magic\n", sb_version(rs));
       return 1;
       }
    }
    else
-       /* s_version may contain incorrect information. Look at the magic
-          string */
-           printk ("reiserfs: found format \"%s\" with standard journal\n",
-                   is_reiserfs_3_5 (rs) ? "3.5" : "3.6");
+      /* s_version of standard format may contain incorrect information,
+        so we just look at the magic string */
+      printk ("found reiserfs format \"%s\" with standard journal\n",
+             is_reiserfs_3_5 (rs) ? "3.5" : "3.6");

    s->s_op = &reiserfs_sops;

@@ -989,9 +987,10 @@
    if (!read_super_block (s, REISERFS_OLD_DISK_OFFSET_IN_BYTES))
      old_format = 1;
    /* try new format (64-th 1k block), which can contain reiserfs super block */
-    else if (read_super_block (s, REISERFS_DISK_OFFSET_IN_BYTES))
+    else if (read_super_block (s, REISERFS_DISK_OFFSET_IN_BYTES)) {
+      printk("sh-2021: reiserfs_read_super: can not find reiserfs on %s\n", s->s_id);
      goto error;
-
+    }
    s->u.reiserfs_sb.s_mount_state = SB_REISERFS_STATE(s);
    s->u.reiserfs_sb.s_mount_state = REISERFS_VALID_FS ;

@@ -1006,7 +1005,7 @@

    // set_device_ro(s->s_dev, 1) ;
    if( journal_init(s, jdev_name, old_format) ) {
-       printk("reiserfs_read_super: unable to initialize journal space\n") ;
+       printk("sh-2022: reiserfs_read_super: unable to initialize journal space\n") ;
       goto error ;
    } else {
       jinit_done = 1 ; /* once this is set, journal_release must be called

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.