Hello, Alan,
this is a small patch with obvious cosmetic changes to reiserfs:
. missing \n and message numbers are added to warnings
. unused reiserfs_version() is removed
Please, apply.
Nikita.
diff -rup linux/fs/reiserfs/objectid.c linux.patched/fs/reiserfs/objectid.c
--- linux/fs/reiserfs/objectid.c Fri Sep 21 15:20:11 2001
+++ linux.patched/fs/reiserfs/objectid.c Fri Sep 21 15:51:52 2001
@@ -162,7 +162,7 @@ void reiserfs_release_objectid (struct r
i += 2;
}
- reiserfs_warning ("vs-15010: reiserfs_release_objectid: tried to free free object
id (%lu)",
+ reiserfs_warning ("vs-15010: reiserfs_release_objectid: tried to free free object
+id (%lu)\n",
( long unsigned ) objectid_to_release);
}
diff -rup linux/fs/reiserfs/prints.c linux.patched/fs/reiserfs/prints.c
--- linux/fs/reiserfs/prints.c Fri Sep 21 15:20:11 2001
+++ linux.patched/fs/reiserfs/prints.c Fri Sep 21 15:51:52 2001
@@ -476,19 +476,6 @@ static int print_leaf (struct buffer_hea
return 0;
}
-static char * reiserfs_version (char * buf)
-{
- __u16 * pversion;
-
- pversion = (__u16 *)(buf) + 36;
- if (*pversion == 0)
- return "0";
- if (*pversion == 2)
- return "2";
- return "Unknown";
-}
-
-
/* return 1 if this is not super block */
static int print_super_block (struct buffer_head * bh)
{
diff -rup linux/fs/reiserfs/stree.c linux.patched/fs/reiserfs/stree.c
--- linux/fs/reiserfs/stree.c Fri Sep 21 15:51:36 2001
+++ linux.patched/fs/reiserfs/stree.c Fri Sep 21 15:51:52 2001
@@ -1400,16 +1400,17 @@ void reiserfs_delete_solid_item (struct
le_key2cpu_key (&cpu_key, key);
+
while (1) {
retval = search_item (th->t_super, &cpu_key, &path);
if (retval == IO_ERROR) {
- reiserfs_warning ("vs-: reiserfs_delete_solid_item: "
+ reiserfs_warning ("vs-5360: reiserfs_delete_solid_item: "
"i/o failure occurred trying to delete %K\n", &cpu_key);
break;
}
if (retval != ITEM_FOUND) {
pathrelse (&path);
- reiserfs_warning ("vs-: reiserfs_delete_solid_item: %k not found",
+ reiserfs_warning ("vs-5380: reiserfs_delete_solid_item: %k not found\n",
key);
break;
}
@@ -1429,7 +1430,7 @@ void reiserfs_delete_solid_item (struct
}
// IO_ERROR, NO_DISK_SPACE, etc
- reiserfs_warning ("vs-: reiserfs_delete_solid_item: "
+ reiserfs_warning ("vs-5400: reiserfs_delete_solid_item: "
"could not delete %K due to fix_nodes failure\n", &cpu_key);
unfix_nodes (&tb);
break;
