# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1049  -> 1.1052 
#	 fs/reiserfs/super.c	1.27    -> 1.30   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/03/13	green@angband.namesys.com	1.1050
# reiserfs: Make balloc[] tails[] and hash[] in super.c static. (Noticed by Arnd Bergmann <arnd@bergmann-dalldorf.de>)
# --------------------------------------------
# 03/03/13	green@angband.namesys.com	1.1051
# reiserfs: gcc 3.3 compile fix from Hubert Mantel <mantel@suse.de>
# --------------------------------------------
# 03/03/13	green@angband.namesys.com	1.1052
# reiserfs: Fix a warning about mismatching types while doing printk.
# --------------------------------------------
#
diff -Nru a/fs/reiserfs/super.c b/fs/reiserfs/super.c
--- a/fs/reiserfs/super.c	Sat Mar 15 15:24:32 2003
+++ b/fs/reiserfs/super.c	Sat Mar 15 15:24:32 2003
@@ -420,7 +420,7 @@
 
 /* possible values for "-o hash=" and bits which are to be set in s_mount_opt
    of reiserfs specific part of in-core super block */
-const arg_desc_t hash[] = {
+static const arg_desc_t hash[] = {
     {"rupasov", FORCE_RUPASOV_HASH},
     {"tea", FORCE_TEA_HASH},
     {"r5", FORCE_R5_HASH},
@@ -431,7 +431,7 @@
 
 /* possible values for "-o block-allocator=" and bits which are to be set in
    s_mount_opt of reiserfs specific part of in-core super block */
-const arg_desc_t balloc[] = {
+static const arg_desc_t balloc[] = {
     {"noborder", REISERFS_NO_BORDER},
     {"no_unhashed_relocation", REISERFS_NO_UNHASHED_RELOCATION},
     {"hashed_relocation", REISERFS_HASHED_RELOCATION},
@@ -439,7 +439,7 @@
     {NULL, 0}
 };
 
-const arg_desc_t tails[] = {
+static const arg_desc_t tails[] = {
     {"on", REISERFS_LARGETAIL},
     {"off", -1},
     {"small", REISERFS_SMALLTAIL},
@@ -865,7 +865,7 @@
     brelse (bh);
 
     if (s->s_blocksize != 4096) {
-	printk("Unsupported reiserfs blocksize: %d on %s, only 4096 bytes "
+	printk("Unsupported reiserfs blocksize: %ld on %s, only 4096 bytes "
 	       "blocksize is supported.\n", s->s_blocksize, kdevname (s->s_dev));
 	return 1;
     }
@@ -941,8 +941,7 @@
     ll_rw_block(READ, 1, &(SB_AP_BITMAP(s)[i].bh)) ;
     wait_on_buffer(SB_AP_BITMAP(s)[i].bh) ;
     if (!buffer_uptodate(SB_AP_BITMAP(s)[i].bh)) {
-      printk("reread_meta_blocks, error reading bitmap block number %d at
-      %ld\n", i, SB_AP_BITMAP(s)[i].bh->b_blocknr) ;
+      printk("reread_meta_blocks, error reading bitmap block number %d at %ld\n", i, SB_AP_BITMAP(s)[i].bh->b_blocknr) ;
       return 1 ;
     }
   }

.