[PATCH] more reiserfs cleanups

	More cleanups (getblk() use, etc.) in reiserfs (again, cleaning
up after merge).

fs/reiserfs/fix_node.c

@@ -2099,7 +2099,7 @@ static void tb_buffer_sanity_check (struct super_block * p_s_sb,
       reiserfs_panic (p_s_sb, "tb_buffer_sanity_check(): buffer is not in tree %s[%d] (%b)\n", descr, level, p_s_bh);
     }
 
-    if (!kdev_same(p_s_bh->b_dev, p_s_sb->s_dev) || 
+    if (p_s_bh->b_bdev != p_s_sb->s_bdev || 
 	p_s_bh->b_size != p_s_sb->s_blocksize ||
 	p_s_bh->b_blocknr > SB_BLOCK_COUNT(p_s_sb)) {
       reiserfs_panic (p_s_sb, "tb_buffer_sanity_check(): check failed for buffer %s[%d] (%b)\n", descr, level, p_s_bh);

fs/reiserfs/inode.c

@@ -1702,7 +1702,7 @@ static int grab_tail_page(struct inode *p_s_inode,
 	** call prepare_write
 	*/
 	reiserfs_warning("clm-6000: error reading block %lu on dev %s\n",
-	                  bh->b_blocknr, kdevname(bh->b_dev)) ;
+	                  bh->b_blocknr, p_s_inode->i_sb->s_id) ;
 	error = -EIO ;
 	goto unlock ;
     }

fs/reiserfs/super.c

@@ -581,11 +581,6 @@ static int parse_options (char * options, unsigned long * mount_options, unsigne
 }
 
 
-int reiserfs_is_super(struct super_block *s) {
-   return (!kdev_same(s->s_dev, NODEV) && s->s_op == &reiserfs_sops) ;
-}
-
-
 //
 // a portion of this function, particularly the VFS interface portion,
 // was derived from minix or ext2's analog and evolved as the
@@ -1201,6 +1196,11 @@ static struct file_system_type reiserfs_fs_type = {
 	fs_flags:	FS_REQUIRES_DEV,
 };
 
+int reiserfs_is_super(struct super_block *s)
+{
+	return s->s_type == &reiserfs_fs_type;
+}
+
 //
 // this is exactly what 2.3.99-pre9's init_ext2_fs is
 //

include/linux/reiserfs_fs_sb.h

@@ -454,6 +454,5 @@ int reiserfs_resize(struct super_block *, unsigned long) ;
 #define SB_JOURNAL_MAX_COMMIT_AGE(s) (SB_JOURNAL(s)->s_journal_max_commit_age)
 #define SB_JOURNAL_MAX_TRANS_AGE(s)  (SB_JOURNAL(s)->s_journal_max_trans_age)
 #define SB_JOURNAL_DEV(s)            (SB_JOURNAL(s)->j_dev)
-  
 
 #endif	/* _LINUX_REISER_FS_SB */