Branch HEAD

b=13568
i=adilger
i=johann

Remove the 2.4 kernel check from mgs subsystem.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 87be2c2..40437fa 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -14,18 +14,26 @@
 
 Severity   : normal
 Bugzilla   : 13568
-Description: Remove 2.4 kernel checks lustre 1.8
+Description: Remove 2.4 kernel support from lustre 1.8.0
 Details    : Remove 2.5.0 check from quota_check.c, quota_ctl.c,
              quota_interface.c in quota subsystem.
             Remove 2.4 kernel check from obd_mount.c, linux/linux-sysctl.c in
              obdclass subsystem.
              Remove lock_24kernel from fsfilt_ext3.c fsfilt_reiserfs.c 
              lvfs_linux.c upcall_cache.c in lvfs subsystem.
+             Remove 2.5.0 check from dcache.c dir.c file.c llite_internal.h
+             llite_lib.c llite_mmap.c lproc_llite.c namei.c rw.c symlink.c
+             in llite subsystem.
+            Remove 2.5.0 check from handler.c lproc_mds.c mds_fs.c
+            mds_internal.h mds_lib.c mds_open.c mds_reint.c mds_xattr.c
+            in mds subsystem.
             Remove 2.4 kernel check from lproc_osc.c, osc_request.c in osc
             subsystem.
             Remove 2.4 kernel check from filter.c, lproc_obdfilter.c in 
             obdfilter subsystem.
             Remove 2.4 kernel code from lustre/obdecho/echo_client.c.
+            Remove 2.4 kernel check from lustre/mgs/lproc_mgs.c,
+            lustre/mgs/mgs_fs.c.
 
 Severity   : enhancement
 Bugzilla   : 13690
@@ -469,15 +477,6 @@ Details    : Update to the latest RHEL 4 kernel to fix the vulnerability
             described in CVE-2007-4573.  This problem could allow untrusted
             local users to gain root access.
 
-Severity   : normal
-Bugzilla   : 13568
-Description: Remove 2.4 kernel checks lustre 1.8
-Details    : Remove 2.5.0 check from dcache.c dir.c file.c llite_internal.h
-             llite_lib.c llite_mmap.c lproc_llite.c namei.c rw.c symlink.c
-             llite subsystem.
-            Remove 2.5.0 check from handler.c lproc_mds.c mds_fs.c
-            mds_internal.h mds_lib.c mds_open.c mds_reint.c mds_xattr.c
-            in mds subsystem.
 
 Severity   : normal
 Frequency  : when using O_DIRECT and quotas

diff --git a/lustre/mgs/lproc_mgs.c b/lustre/mgs/lproc_mgs.c
index 7320eba..6ed7aab 100644 (file)
--- a/lustre/mgs/lproc_mgs.c
+++ b/lustre/mgs/lproc_mgs.c
@@ -25,9 +25,7 @@
 #define DEBUG_SUBSYSTEM S_CLASS
 
 #include <linux/version.h>
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
 #include <asm/statfs.h>
-#endif
 #include <obd.h>
 #include <obd_class.h>
 #include <lprocfs_status.h>

diff --git a/lustre/mgs/mgs_fs.c b/lustre/mgs/mgs_fs.c
index aab8443..6eabd20 100644 (file)
--- a/lustre/mgs/mgs_fs.c
+++ b/lustre/mgs/mgs_fs.c
@@ -31,9 +31,7 @@
 #include <linux/kmod.h>
 #include <linux/version.h>
 #include <linux/sched.h>
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
 #include <linux/mount.h>
-#endif
 #include <obd_class.h>
 #include <obd_support.h>
 #include <lustre_disk.h>