b=22882 MMP might sleep negative time

i=adilger
i=girish

diff --git a/ldiskfs/ChangeLog b/ldiskfs/ChangeLog
index 91b771e..355feea 100644 (file)
--- a/ldiskfs/ChangeLog
+++ b/ldiskfs/ChangeLog
@@ -1,6 +1,10 @@
 xxxx-xx-xx Oracle, Inc.
        * version 3.1.5
 
+Severity   : normal
+Bugzilla   : 22882
+Description: MMP might sleep negative time
+
 -------------------------------------------------------------------------------
 
 2010-10-29 Oracle, Inc.

diff --git a/ldiskfs/kernel_patches/patches/ext3-mmp-2.6-sles10.patch b/ldiskfs/kernel_patches/patches/ext3-mmp-2.6-sles10.patch
index 239d1e1..bd0ac1c 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-mmp-2.6-sles10.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-mmp-2.6-sles10.patch
@@ -216,7 +216,7 @@ Index: linux-stage/fs/ext3/super.c
 +
 +              diff = jiffies - last_update_time;
 +              if (diff < mmp_update_interval * HZ)
-+                      schedule_timeout_interruptible(EXT3_MMP_UPDATE_INTERVAL*
++                      schedule_timeout_interruptible(mmp_update_interval *
 +                                                     HZ - diff);
 +
 +              /*

diff --git a/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.18-vanilla.patch b/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.18-vanilla.patch
index 0ee6718..b056623 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.18-vanilla.patch
+++ b/ldiskfs/kernel_patches/patches/ext3-mmp-2.6.18-vanilla.patch
@@ -216,7 +216,7 @@ Index: linux-stage/fs/ext3/super.c
 +
 +              diff = jiffies - last_update_time;
 +              if (diff < mmp_update_interval * HZ)
-+                      schedule_timeout_interruptible(EXT3_MMP_UPDATE_INTERVAL*
++                      schedule_timeout_interruptible(mmp_update_interval *
 +                                                     HZ - diff);
 +
 +              /*

diff --git a/ldiskfs/kernel_patches/patches/ext4-mmp-rhel5.patch b/ldiskfs/kernel_patches/patches/ext4-mmp-rhel5.patch
index 7bd8c7c..7caff75 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext4-mmp-rhel5.patch
+++ b/ldiskfs/kernel_patches/patches/ext4-mmp-rhel5.patch
@@ -171,7 +171,7 @@ Index: linux-stage/fs/ext4/super.c
 +
 +              diff = jiffies - last_update_time;
 +              if (diff < mmp_update_interval * HZ)
-+                      schedule_timeout_interruptible(EXT4_MMP_UPDATE_INTERVAL*
++                      schedule_timeout_interruptible(mmp_update_interval *
 +                                                     HZ - diff);
 +
 +              /*

diff --git a/ldiskfs/kernel_patches/patches/ext4-mmp-sles11.patch b/ldiskfs/kernel_patches/patches/ext4-mmp-sles11.patch
index 16f35f4..8755887 100644 (file)
--- a/ldiskfs/kernel_patches/patches/ext4-mmp-sles11.patch
+++ b/ldiskfs/kernel_patches/patches/ext4-mmp-sles11.patch
@@ -175,7 +175,7 @@ Index: linux-stage/fs/ext4/super.c
 +
 +              diff = jiffies - last_update_time;
 +              if (diff < mmp_update_interval * HZ)
-+                      schedule_timeout_interruptible(EXT4_MMP_UPDATE_INTERVAL*
++                      schedule_timeout_interruptible(mmp_update_interval *
 +                                                     HZ - diff);
 +
 +              /*