Branch HEAD

b=13568
i=adilger
i=wangdi

Remove 2.5.0 kernel check from quota subsystem.

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). 
 
+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>

lustre/quota/quota_check.c

@@ -22,14 +22,10 @@
 # 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

lustre/quota/quota_ctl.c

@@ -23,14 +23,10 @@
 # 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

lustre/quota/quota_interface.c

@@ -22,14 +22,10 @@
 # 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