[kernel] r18970 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Ben Hutchings]

Author: benh
Date: Tue May  1 01:45:51 2012
New Revision: 18970

Log:
ext4: Report max_batch_time option correctly (Closes: #654206)

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/ext4-Report-max_batch_time-option-correctly.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/base

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Tue May  1 01:45:02 2012	(r18969)
+++ dists/sid/linux-2.6/debian/changelog	Tue May  1 01:45:51 2012	(r18970)
@@ -2,6 +2,7 @@
 
   [ Ben Hutchings ]
   * aufs: Enable AUFS_EXPORT
+  * ext4: Report max_batch_time option correctly (Closes: #654206)
 
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 01 May 2012 00:43:48 +0100
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/ext4-Report-max_batch_time-option-correctly.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/ext4-Report-max_batch_time-option-correctly.patch	Tue May  1 01:45:51 2012	(r18970)
@@ -0,0 +1,31 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Wed, 4 Jan 2012 21:22:51 -0500
+Subject: [PATCH] ext4: Report max_batch_time option correctly
+
+commit 1d526fc91bea04ee35b7599bf8b82f86c0aaf46c upstream.
+
+Currently the value reported for max_batch_time is really the
+value of min_batch_time.
+
+Reported-by: Russell Coker <russell at coker.com.au>
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ fs/ext4/super.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fs/ext4/super.c b/fs/ext4/super.c
+index 35377d5..36570b7 100644
+--- a/fs/ext4/super.c
++++ b/fs/ext4/super.c
+@@ -1096,7 +1096,7 @@ static int ext4_show_options(struct seq_file *seq, struct vfsmount *vfs)
+ 	}
+ 	if (sbi->s_max_batch_time != EXT4_DEF_MAX_BATCH_TIME) {
+ 		seq_printf(seq, ",max_batch_time=%u",
+-			   (unsigned) sbi->s_min_batch_time);
++			   (unsigned) sbi->s_max_batch_time);
+ 	}
+ 
+ 	/*
+-- 
+1.7.10
+

Modified: dists/sid/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/base	Tue May  1 01:45:02 2012	(r18969)
+++ dists/sid/linux-2.6/debian/patches/series/base	Tue May  1 01:45:51 2012	(r18970)
@@ -198,3 +198,5 @@
 + debian/revert-rtc-Provide-flag-for-rtc-devices-that-don-t-s.patch
 + debian/nls-Avoid-ABI-change-from-improvement-to-utf8s_to_ut.patch
 + debian/efi-avoid-ABI-change.patch
+
++ bugfix/all/ext4-Report-max_batch_time-option-correctly.patch