diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 99b7f792eb4f1a83792c11806b1b37da1a4fe6e0..09edcfdf4b4584e8d3a26a5f09e5899641c38c68 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -36,6 +36,7 @@ Details : Remove 2.5.0 check from quota_check.c, quota_ctl.c, lustre/mgs/mgs_fs.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. Severity : enhancement Bugzilla : 13690 diff --git a/lustre/mdc/mdc_request.c b/lustre/mdc/mdc_request.c index dfcb26b966704cb946949d041a71f47f9e28e146..8eb065dd070fa97a6443efc970498a45253dc9a8 100644 --- a/lustre/mdc/mdc_request.c +++ b/lustre/mdc/mdc_request.c @@ -1054,14 +1054,10 @@ static int mdc_iocontrol(unsigned int cmd, struct obd_export *exp, int len, int rc; 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_CLIENT_RECOVER: rc = ptlrpc_recover_import(imp, data->ioc_inlbuf1); @@ -1094,11 +1090,7 @@ static int mdc_iocontrol(unsigned int cmd, struct obd_export *exp, int len, GOTO(out, rc = -ENOTTY); } out: -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) - MOD_DEC_USE_COUNT; -#else module_put(THIS_MODULE); -#endif return rc; }