[patch] reiserfs support for laptop_mode

[Micha Feigin]

I've been using this since 2.4.22 and since laptop_mode is in the
kernel since 2.4.23-pre<something> and I haven't seen that anyone else
has implemented this so I decided to post it on the list in case anyone
is interested.
It a patch to modify the journal flush time of reiserfs to support
laptop_mode (same functionality as ext3 has already).
The times are taken from bdflush.

--- kernel-source-2.4.25-pre6/fs/reiserfs/journal.c	2003-08-25 14:44:43.000000000 +0300
+++ kernel-source-2.4.25-pre6.new/fs/reiserfs/journal.c	2003-10-20 03:35:58.000000000 +0200
@@ -58,6 +58,7 @@
 #include <linux/stat.h>
 #include <linux/string.h>
 #include <linux/smp_lock.h>
+#include <linux/fs.h>
 
 /* the number of mounted filesystems.  This is used to decide when to
 ** start and kill the commit thread
@@ -2659,8 +2660,12 @@
   /* starting with oldest, loop until we get to the start */
   i = (SB_JOURNAL_LIST_INDEX(p_s_sb) + 1) % JOURNAL_LIST_COUNT ;
   while(i != start) {
-    if (SB_JOURNAL_LIST(p_s_sb)[i].j_len > 0 && ((now - SB_JOURNAL_LIST(p_s_sb)[i].j_timestamp) > SB_JOURNAL_MAX_COMMIT_AGE(p_s_sb) ||
-       immediate)) {
+    /* get_buffer_age() / HZ is used since the time returned by
+     * get_buffer_age is in sec * HZ and the journal time is taken in seconds.
+     */
+    if (SB_JOURNAL_LIST(p_s_sb)[i].j_len > 0 &&
+	((now - SB_JOURNAL_LIST(p_s_sb)[i].j_timestamp) > get_buffer_age() / HZ
+	 || immediate)) {
       /* we have to check again to be sure the current transaction did not change */
       if (i != SB_JOURNAL_LIST_INDEX(p_s_sb))  {
 	flush_commit_list(p_s_sb, SB_JOURNAL_LIST(p_s_sb) + i, 1) ;
--- kernel-source-2.4.25-pre6/fs/reiserfs/procfs.c	2003-08-25 14:44:43.000000000 +0300
+++ kernel-source-2.4.25-pre6.new/fs/reiserfs/procfs.c	2003-10-20 03:36:11.000000000 +0200
@@ -18,6 +18,7 @@
 #include <linux/locks.h>
 #include <linux/init.h>
 #include <linux/proc_fs.h>
+#include <linux/fs.h>
 
 #if defined( REISERFS_PROC_INFO )
 
@@ -528,7 +529,11 @@
                         DJP( jp_journal_trans_max ),
                         DJP( jp_journal_magic ),
                         DJP( jp_journal_max_batch ),
-                        DJP( jp_journal_max_commit_age ),
+			/* get_buffer_age() / HZ is used since the
+			 * time returned by get_buffer_age is in sec * HZ
+			 * and the journal time is in seconds.
+			 */
+                        get_buffer_age()/HZ,
                         DJP( jp_journal_max_trans_age ),
 
  			JF( j_1st_reserved_block ),
--- kernel-source-2.4.25-pre6/fs/buffer.c	2003-12-12 01:35:46.000000000 +0200
+++ kernel-source-2.4.25-pre6.new/fs/buffer.c	2003-12-12 01:41:20.000000000 +0200
@@ -1128,6 +1128,12 @@
 }
 EXPORT_SYMBOL(get_buffer_flushtime);
 
+inline int get_buffer_age(void)
+{
+	return bdf_prm.b_un.age_buffer;
+}
+EXPORT_SYMBOL(get_buffer_age);
+
 /*
  * A buffer may need to be moved from one buffer list to another
  * (e.g. in case it is not shared any more). Handle this.
--- kernel-source-2.4.25-pre6/include/linux/fs.h	2003-12-12 01:45:20.000000000 +0200
+++ kernel-source-2.4.23-5-pre6.new/include/linux/fs.h	2003-12-12 01:45:42.000000000 +0200
@@ -1260,6 +1260,7 @@
 
 extern void set_buffer_flushtime(struct buffer_head *);
 extern inline int get_buffer_flushtime(void);
+extern inline int get_buffer_age(void);
 extern void balance_dirty(void);
 extern int check_disk_change(kdev_t);
 extern int invalidate_inodes(struct super_block *);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/