Branch HEAD

b=13568
i=adilger
i=wangdi

Remove 2.5.0 kernel check from quota subsystem.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 86ffc43..c120b35 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -368,6 +368,12 @@ Details    : Modify target file & which_patch.
              could exploit this flaw to run code in the kernel 
              (ie a root privilege escalation). (CVE-2007-4573). 
 
              could exploit this flaw to run code in the kernel 
              (ie a root privilege escalation). (CVE-2007-4573). 
 

+Severity   : normal
+Bugzilla   : 13568
+Description: Remove 2.4 kernel checks lustre 1.8
+Details    : Remove 2.5.0 check from quota_check.c, quota_ctl.c,
+             quota_interface.c in quota subsystem.
+

 --------------------------------------------------------------------------------
 
 2007-08-10         Cluster File Systems, Inc. <info@clusterfs.com>
 --------------------------------------------------------------------------------
 
 2007-08-10         Cluster File Systems, Inc. <info@clusterfs.com>

diff --git a/lustre/quota/quota_check.c b/lustre/quota/quota_check.c
index 1596b74..5cecee1 100644 (file)
--- a/lustre/quota/quota_check.c
+++ b/lustre/quota/quota_check.c
@@ -22,14 +22,10 @@
 # include <linux/fs.h>
 # include <linux/jbd.h>
 # include <linux/ext3_fs.h>
 # include <linux/fs.h>
 # include <linux/jbd.h>
 # include <linux/ext3_fs.h>

-# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
-#  include <linux/smp_lock.h>
-#  include <linux/buffer_head.h>
-#  include <linux/workqueue.h>
-#  include <linux/mount.h>
-# else
-#  include <linux/locks.h>
-# endif
+# include <linux/smp_lock.h>
+# include <linux/buffer_head.h>
+# include <linux/workqueue.h>
+# include <linux/mount.h>

 #else /* __KERNEL__ */
 # include <liblustre.h>
 #endif
 #else /* __KERNEL__ */
 # include <liblustre.h>
 #endif

diff --git a/lustre/quota/quota_ctl.c b/lustre/quota/quota_ctl.c
index 4f50f7d..c0641fc 100644 (file)
--- a/lustre/quota/quota_ctl.c
+++ b/lustre/quota/quota_ctl.c
@@ -23,14 +23,10 @@
 # include <linux/jbd.h>
 # include <linux/ext3_fs.h>
 # include <linux/quota.h>
 # include <linux/jbd.h>
 # include <linux/ext3_fs.h>
 # include <linux/quota.h>

-# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
-#  include <linux/smp_lock.h>
-#  include <linux/buffer_head.h>
-#  include <linux/workqueue.h>
-#  include <linux/mount.h>
-# else
-#  include <linux/locks.h>
-# endif
+# include <linux/smp_lock.h>
+# include <linux/buffer_head.h>
+# include <linux/workqueue.h>
+# include <linux/mount.h>

 #else /* __KERNEL__ */
 # include <liblustre.h>
 #endif
 #else /* __KERNEL__ */
 # include <liblustre.h>
 #endif

diff --git a/lustre/quota/quota_interface.c b/lustre/quota/quota_interface.c
index d7084a9..09a6b20 100644 (file)
--- a/lustre/quota/quota_interface.c
+++ b/lustre/quota/quota_interface.c
@@ -22,14 +22,10 @@
 # include <linux/fs.h>
 # include <linux/jbd.h>
 # include <linux/ext3_fs.h>
 # include <linux/fs.h>
 # include <linux/jbd.h>
 # include <linux/ext3_fs.h>

-# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
-#  include <linux/smp_lock.h>
-#  include <linux/buffer_head.h>
-#  include <linux/workqueue.h>
-#  include <linux/mount.h>
-# else
-#  include <linux/locks.h>
-# endif
+# include <linux/smp_lock.h>
+# include <linux/buffer_head.h>
+# include <linux/workqueue.h>
+# include <linux/mount.h>

 #else /* __KERNEL__ */
 # include <liblustre.h>
 #endif
 #else /* __KERNEL__ */
 # include <liblustre.h>
 #endif