Branch HEAD

b=12568
i=adilger
i=scjody

Remove 2.4 kernel check from obdfilter/filter.c, obdfilter/lproc_obdfilter.c.

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 56745a2..e1ec608 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -23,6 +23,8 @@ Details    : Remove 2.5.0 check from quota_check.c, quota_ctl.c,
              lvfs_linux.c upcall_cache.c in lvfs subsystem.
             Remove 2.4 kernel check from lproc_osc.c, osc_request.c in osc
             subsystem.
              lvfs_linux.c upcall_cache.c in lvfs 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.

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

diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c
index ea2bd49..3bf974d 100644 (file)
--- a/lustre/obdfilter/filter.c
+++ b/lustre/obdfilter/filter.c
@@ -44,10 +44,8 @@
 #include <linux/init.h>
 #include <linux/version.h>
 #include <linux/sched.h>
 #include <linux/init.h>
 #include <linux/version.h>
 #include <linux/sched.h>

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

 
 #include <obd_class.h>
 #include <obd_lov.h>
 
 #include <obd_class.h>
 #include <obd_lov.h>


@@ -1528,11 +1526,9 @@ int filter_vfs_unlink(struct inode *dir, struct dentry *dentry)
          *       here) or some other ordering issue. */
         DQUOT_INIT(dir);
 
          *       here) or some other ordering issue. */
         DQUOT_INIT(dir);
 

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

         rc = security_inode_unlink(dir, dentry);
         if (rc)
                 GOTO(out, rc);
         rc = security_inode_unlink(dir, dentry);
         if (rc)
                 GOTO(out, rc);

-#endif

 
         rc = dir->i_op->unlink(dir, dentry);
 out:
 
         rc = dir->i_op->unlink(dir, dentry);
 out:

diff --git a/lustre/obdfilter/lproc_obdfilter.c b/lustre/obdfilter/lproc_obdfilter.c
index 9f9c953..f0984fa 100644 (file)
--- a/lustre/obdfilter/lproc_obdfilter.c
+++ b/lustre/obdfilter/lproc_obdfilter.c
@@ -381,7 +381,6 @@ static void brw_stats_show(struct seq_file *seq, struct brw_stats *brw_stats)
                           &brw_stats->hist[BRW_R_DIO_FRAGS],
                           &brw_stats->hist[BRW_W_DIO_FRAGS], 0);
 
                           &brw_stats->hist[BRW_R_DIO_FRAGS],
                           &brw_stats->hist[BRW_W_DIO_FRAGS], 0);
 

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

         display_brw_stats(seq, "disk I/Os in flight", "ios",
                           &brw_stats->hist[BRW_R_RPC_HIST],
                           &brw_stats->hist[BRW_W_RPC_HIST], 0);
         display_brw_stats(seq, "disk I/Os in flight", "ios",
                           &brw_stats->hist[BRW_R_RPC_HIST],
                           &brw_stats->hist[BRW_W_RPC_HIST], 0);


@@ -397,7 +396,6 @@ static void brw_stats_show(struct seq_file *seq, struct brw_stats *brw_stats)
         display_brw_stats(seq, "disk I/O size", "ios",
                           &brw_stats->hist[BRW_R_DISK_IOSIZE],
                           &brw_stats->hist[BRW_W_DISK_IOSIZE], 1);
         display_brw_stats(seq, "disk I/O size", "ios",
                           &brw_stats->hist[BRW_R_DISK_IOSIZE],
                           &brw_stats->hist[BRW_W_DISK_IOSIZE], 1);

-#endif

 }
 
 static int filter_brw_stats_seq_show(struct seq_file *seq, void *v)
 }
 
 static int filter_brw_stats_seq_show(struct seq_file *seq, void *v)