diff -u -r linux-src/fs/reiserfs/procfs.c linux/fs/reiserfs/procfs.c
--- linux-2.5.2-pre8/fs/reiserfs/procfs.c Fri Jan 4 19:40:37 2002
+++ linux/fs/reiserfs/procfs.c Sat Jan 5 05:12:34 2002
@@ -77,7 +77,7 @@
int len = 0;
struct super_block *sb;
- sb = procinfo_prologue( ( kdev_t ) ( int ) data );
+ sb = procinfo_prologue( to_kdev_t((int)data) );
if( sb == NULL )
return -ENOENT;
len += sprintf( &buffer[ len ], "%s format\twith checks %s\n",
@@ -134,7 +134,7 @@
struct reiserfs_sb_info *r;
int len = 0;
- sb = procinfo_prologue( ( kdev_t ) ( int ) data );
+ sb = procinfo_prologue( to_kdev_t((int)data) );
if( sb == NULL )
return -ENOENT;
r = &sb->u.reiserfs_sb;
@@ -214,7 +214,7 @@
int len = 0;
int level;
- sb = procinfo_prologue( ( kdev_t ) ( int ) data );
+ sb = procinfo_prologue( to_kdev_t((int)data) );
if( sb == NULL )
return -ENOENT;
r = &sb->u.reiserfs_sb;
@@ -293,7 +293,7 @@
struct reiserfs_sb_info *r = &sb->u.reiserfs_sb;
int len = 0;
- sb = procinfo_prologue( ( kdev_t ) ( int ) data );
+ sb = procinfo_prologue( to_kdev_t((int)data) );
if( sb == NULL )
return -ENOENT;
r = &sb->u.reiserfs_sb;
@@ -334,7 +334,7 @@
int hash_code;
int len = 0;
- sb = procinfo_prologue( ( kdev_t ) ( int ) data );
+ sb = procinfo_prologue( to_kdev_t((int)data) );
if( sb == NULL )
return -ENOENT;
sb_info = &sb->u.reiserfs_sb;
@@ -387,7 +387,7 @@
int len = 0;
int exact;
- sb = procinfo_prologue( ( kdev_t ) ( int ) data );
+ sb = procinfo_prologue( to_kdev_t((int)data) );
if( sb == NULL )
return -ENOENT;
sb_info = &sb->u.reiserfs_sb;
@@ -438,7 +438,7 @@
struct reiserfs_super_block *rs;
int len = 0;
- sb = procinfo_prologue( ( kdev_t ) ( int ) data );
+ sb = procinfo_prologue( to_kdev_t((int)data) );
if( sb == NULL )
return -ENOENT;
r = &sb->u.reiserfs_sb;
@@ -491,7 +491,7 @@
"prepare_retry: \t%12lu\n",
DJF( s_journal_block ),
- DJF( s_journal_dev ) == 0 ? "none" : bdevname( DJF( s_journal_dev ) ),
+ DJF( s_journal_dev ) == 0 ? "none" : bdevname( to_kdev_t( DJF( s_journal_dev ) ) ),
DJF( s_journal_dev ),
DJF( s_orig_journal_size ),
DJF( s_journal_trans_max ),
@@ -578,7 +578,7 @@
{
return ( sb->u.reiserfs_sb.procdir ) ? create_proc_read_entry
( name, 0, sb->u.reiserfs_sb.procdir, func,
- ( void * ) ( int ) sb -> s_dev ) : NULL;
+ ( void * ) kdev_t_to_nr( sb -> s_dev ) ) : NULL;
}
void reiserfs_proc_unregister( struct super_block *sb, const char *name )