vserver 1.9.5.x5

[linux-2.6.git] / fs / reiserfs / procfs.c

diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
index b9f5be9..f4ea81a 100644 (file)
--- a/fs/reiserfs/procfs.c
+++ b/fs/reiserfs/procfs.c
@@ -399,7 +399,7 @@ static int show_journal(struct seq_file *m, struct super_block *sb)
                         DJP( jp_journal_trans_max ),
                         DJP( jp_journal_magic ),
                         DJP( jp_journal_max_batch ),
-                        SB_JOURNAL_MAX_COMMIT_AGE(sb),
+                       SB_JOURNAL(sb)->j_max_commit_age,
                         DJP( jp_journal_max_trans_age ),
 
                        JF( j_1st_reserved_block ),                     
@@ -591,7 +591,7 @@ void reiserfs_proc_unregister_global( const char *name )
 int reiserfs_proc_info_global_init( void )
 {
        if( proc_info_root == NULL ) {
-               proc_info_root = proc_mkdir( proc_info_root_name, 0 );
+               proc_info_root = proc_mkdir(proc_info_root_name, NULL);
                if( proc_info_root ) {
                        proc_info_root -> owner = THIS_MODULE;
                } else {
@@ -608,7 +608,7 @@ int reiserfs_proc_info_global_done( void )
 {
        if ( proc_info_root != NULL ) {
                proc_info_root = NULL;
-               remove_proc_entry( proc_info_root_name, 0 );
+               remove_proc_entry(proc_info_root_name, NULL);
        }
        return 0;
 }