Branch HEAD

b=13568
i=green
i=adilger

Remove 2.4 kernel check from lustre/lov/lproc_lov.c.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 09edcfd..819b59c 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -37,6 +37,7 @@ Details    : Remove 2.5.0 check from quota_check.c, quota_ctl.c,
             Remove 2.4 kernel code from lustre/mgc/mgc_request.c.
             Remove 2.4 kernel check from lustre/mdt/mdt_lproc.c.
             Remove 2.4 kernel code from lustre/mdc/mdc_request.c.
             Remove 2.4 kernel code from lustre/mgc/mgc_request.c.
             Remove 2.4 kernel check from lustre/mdt/mdt_lproc.c.
             Remove 2.4 kernel code from lustre/mdc/mdc_request.c.

+            Remove 2.4 kernel check from lustre/lov/lproc_lov.c.

 
 Severity   : enhancement
 Bugzilla   : 13690
 
 Severity   : enhancement
 Bugzilla   : 13690

diff --git a/lustre/lov/lproc_lov.c b/lustre/lov/lproc_lov.c
index 6e41caf..0fa460b 100644 (file)
--- a/lustre/lov/lproc_lov.c
+++ b/lustre/lov/lproc_lov.c
@@ -25,9 +25,7 @@
 #define DEBUG_SUBSYSTEM S_CLASS
 
 #include <linux/version.h>
 #define DEBUG_SUBSYSTEM S_CLASS
 
 #include <linux/version.h>

-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))

 #include <asm/statfs.h>
 #include <asm/statfs.h>

-#endif

 #include <lprocfs_status.h>
 #include <obd_class.h>
 #include <linux/seq_file.h>
 #include <lprocfs_status.h>
 #include <obd_class.h>
 #include <linux/seq_file.h>