diff --git a/lustre/ChangeLog b/lustre/ChangeLog index a23347955267934167faa89c32fe1355fea27619..56745a2aa1222169c8b4d7654519055b5fc8c642 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -12,6 +12,18 @@ * Recommended e2fsprogs version: 1.40.2-cfs1 * Note that reiserfs quotas are disabled on SLES 10 in this kernel. +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. + 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.4 kernel check from lproc_osc.c, osc_request.c in osc + subsystem. + Severity : enhancement Bugzilla : 13690 Description: Build SLES10 patchless client fails @@ -404,16 +416,6 @@ 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. - 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. - Severity : major Bugzilla : 13093 Description: O_DIRECT bypasses client statistics. diff --git a/lustre/osc/lproc_osc.c b/lustre/osc/lproc_osc.c index 3c40725cd42782769ec76e0a48a162155f8e80ec..6b9d85396dcdd13e541ab2f7b385756c1b9172a8 100644 --- a/lustre/osc/lproc_osc.c +++ b/lustre/osc/lproc_osc.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_class.h> #include <lprocfs_status.h> #include <linux/seq_file.h> diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c index 41f368819cfff7238b4efd7ad65c03a9a1ac6052..bab0344ab2d82501222fe0b6ae4335307a193e64 100644 --- a/lustre/osc/osc_request.c +++ b/lustre/osc/osc_request.c @@ -3229,14 +3229,10 @@ static int osc_iocontrol(unsigned int cmd, struct obd_export *exp, int len, int err = 0; ENTRY; -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) - MOD_INC_USE_COUNT; -#else if (!try_module_get(THIS_MODULE)) { CERROR("Can't get module. Is it alive?"); return -EINVAL; } -#endif switch (cmd) { case OBD_IOC_LOV_GET_CONFIG: { char *buf; @@ -3305,11 +3301,7 @@ static int osc_iocontrol(unsigned int cmd, struct obd_export *exp, int len, GOTO(out, err = -ENOTTY); } out: -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) - MOD_DEC_USE_COUNT; -#else module_put(THIS_MODULE); -#endif return err; }