[PATCH] reiserfs commit_max_age mount option

From: Nikita Danilov <Nikita@Namesys.COM>

Add "commit" reiserfs mount option to override maximal transaction age.
Usage:

mount -treiserfs -ocommit=<time-in-seconds> /device /mountpoint

Submitted by Hugang <hugang@soulinfo.com>.

diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c
index 9fe1f3817dfdd36daf4fee2b47d4de49d752d391..db1dfe91c2a4b3257f08e9b6b1343906a434b1b3 100644 (file)
--- a/fs/reiserfs/journal.c
+++ b/fs/reiserfs/journal.c
@@ -1967,7 +1967,7 @@ static int journal_init_dev( struct super_block *super,
 /*
 ** must be called once on fs mount.  calls journal_read for you
 */
-int journal_init(struct super_block *p_s_sb, const char * j_dev_name, int old_format) {
+int journal_init(struct super_block *p_s_sb, const char * j_dev_name, int old_format, unsigned int commit_max_age) {
     int num_cnodes = SB_ONDISK_JOURNAL_SIZE(p_s_sb) * 2 ;
     struct buffer_head *bhjh;
     struct reiserfs_super_block * rs;
@@ -2032,7 +2032,11 @@ int journal_init(struct super_block *p_s_sb, const char * j_dev_name, int old_fo
      
   SB_JOURNAL_TRANS_MAX(p_s_sb)      = le32_to_cpu (jh->jh_journal.jp_journal_trans_max);
   SB_JOURNAL_MAX_BATCH(p_s_sb)      = le32_to_cpu (jh->jh_journal.jp_journal_max_batch);
+  if (commit_max_age != 0) {
+         SB_JOURNAL_MAX_COMMIT_AGE(p_s_sb) = commit_max_age;
+  } else {
   SB_JOURNAL_MAX_COMMIT_AGE(p_s_sb) = le32_to_cpu (jh->jh_journal.jp_journal_max_commit_age);
+  }
   SB_JOURNAL_MAX_TRANS_AGE(p_s_sb)  = JOURNAL_MAX_TRANS_AGE;
 
   if (SB_JOURNAL_TRANS_MAX(p_s_sb)) {

diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
index 377d12003f2192868f7ae29cbdb0e28b16202980..0b4db272a566b215f81544aaead93b493b25b3ab 100644 (file)
--- a/fs/reiserfs/procfs.c
+++ b/fs/reiserfs/procfs.c
@@ -401,7 +401,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 ),
-                        DJP( jp_journal_max_commit_age ),
+                        SB_JOURNAL_MAX_COMMIT_AGE(sb),
                         DJP( jp_journal_max_trans_age ),
 
                        JF( j_1st_reserved_block ),                     

diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index e6808419fed8339b99577dc93edc4cd910f258dc..df7baf79e8896b198c52432d60332574f9650a1b 100644 (file)
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -645,7 +645,8 @@ static int reiserfs_parse_options (struct super_block * s, char * options, /* st
                                      collection of bitflags defining what
                                      mount options were selected. */
                                   unsigned long * blocks, /* strtol-ed from NNN of resize=NNN */
-                                  char ** jdev_name)
+                                  char ** jdev_name,
+                                  unsigned int * commit_max_age)
 {
     int c;
     char * arg = NULL;
@@ -662,6 +663,7 @@ static int reiserfs_parse_options (struct super_block * s, char * options, /* st
        {"resize", 'r', 0, 0, 0},
        {"jdev", 'j', 0, 0, 0},
        {"nolargeio", 'w', 0, 0, 0},
+       {"commit", 'c', 0, 0, 0},
        {NULL, 0, 0, 0, 0}
     };
        
@@ -690,6 +692,19 @@ static int reiserfs_parse_options (struct super_block * s, char * options, /* st
            }
        }
 
+       if ( c == 'c' ) {
+               char *p = 0;
+               int val = simple_strtoul (arg, &p, 0);
+               /* commit=NNN (time in seconds) */
+               if ( *p != '\0' || val == 0) {
+                       printk ("reiserfs_parse_options: bad value %s\n", arg);
+                       return 0;
+               }
+               if ( val > 0 ) {
+                       *commit_max_age = val;
+               }
+       }
+
        if ( c == 'w' ) {
                char *p=0;
                int val = simple_strtoul (arg, &p, 0);
@@ -743,10 +758,11 @@ static int reiserfs_remount (struct super_block * s, int * mount_flags, char * a
   unsigned long blocks;
   unsigned long mount_options = REISERFS_SB(s)->s_mount_opt;
   unsigned long safe_mask = 0;
+  unsigned int commit_max_age = 0;
 
   rs = SB_DISK_SUPER_BLOCK (s);
 
-  if (!reiserfs_parse_options(s, arg, &mount_options, &blocks, NULL))
+  if (!reiserfs_parse_options(s, arg, &mount_options, &blocks, NULL, &commit_max_age))
     return -EINVAL;
   
   handle_attrs(s);
@@ -764,6 +780,10 @@ static int reiserfs_remount (struct super_block * s, int * mount_flags, char * a
    * the bits we're not allowed to change here */
   REISERFS_SB(s)->s_mount_opt = (REISERFS_SB(s)->s_mount_opt & ~safe_mask) |  (mount_options & safe_mask);
 
+  if(commit_max_age != 0) {
+         SB_JOURNAL_MAX_COMMIT_AGE(s) = commit_max_age;
+  }
+
   if(blocks) {
     int rc = reiserfs_resize(s, blocks);
     if (rc != 0)
@@ -1217,6 +1237,7 @@ static int reiserfs_fill_super (struct super_block * s, void * data, int silent)
     struct reiserfs_transaction_handle th ;
     int old_format = 0;
     unsigned long blocks;
+       unsigned int commit_max_age = 0;
     int jinit_done = 0 ;
     struct reiserfs_iget_args args ;
     struct reiserfs_super_block * rs;
@@ -1241,7 +1262,7 @@ static int reiserfs_fill_super (struct super_block * s, void * data, int silent)
     REISERFS_SB(s)->s_alloc_options.preallocsize = 9;
 
     jdev_name = NULL;
-    if (reiserfs_parse_options (s, (char *) data, &(sbi->s_mount_opt), &blocks, &jdev_name) == 0) {
+    if (reiserfs_parse_options (s, (char *) data, &(sbi->s_mount_opt), &blocks, &jdev_name, &commit_max_age) == 0) {
        goto error;
     }
 
@@ -1283,7 +1304,7 @@ static int reiserfs_fill_super (struct super_block * s, void * data, int silent)
 #endif
 
     // set_device_ro(s->s_dev, 1) ;
-    if(journal_init(s, jdev_name, old_format)) {
+    if( journal_init(s, jdev_name, old_format, commit_max_age) ) {
        SPRINTK(silent, "sh-2022: reiserfs_fill_super: unable to initialize journal space\n") ;
        goto error ;
     } else {

diff --git a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
index a34e79044978c7fe56be2e56c644da2b8f447503..32fe6c84b3b6b37a907ca6955f4a73255728e555 100644 (file)
--- a/include/linux/reiserfs_fs.h
+++ b/include/linux/reiserfs_fs.h
@@ -1719,7 +1719,7 @@ void reiserfs_allow_writes(struct super_block *s) ;
 void reiserfs_check_lock_depth(char *caller) ;
 void reiserfs_prepare_for_journal(struct super_block *, struct buffer_head *bh, int wait) ;
 void reiserfs_restore_prepared_buffer(struct super_block *, struct buffer_head *bh) ;
-int journal_init(struct super_block *, const char * j_dev_name, int old_format) ;
+int journal_init(struct super_block *, const char * j_dev_name, int old_format, unsigned int) ;
 int journal_release(struct reiserfs_transaction_handle*, struct super_block *) ;
 int journal_release_error(struct reiserfs_transaction_handle*, struct super_block *) ;
 int journal_end(struct reiserfs_transaction_handle *, struct super_block *, unsigned long) ;