From aafe788155c5d0deb34df64167cce106f08698ef Mon Sep 17 00:00:00 2001
From: yangsheng <yangsheng>
Date: Fri, 2 Nov 2007 07:41:40 +0000
Subject: [PATCH] Branch HEAD b=13568 i=nathan i=scjody
Remove 2.4 kernel code from lustre/mgc/mgc_request.c.
---
lustre/ChangeLog | 1 +
lustre/mgc/mgc_request.c | 8 --------
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 40437fa51c..325bd3e9ee 100644
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -34,6 +34,7 @@ Details : Remove 2.5.0 check from quota_check.c, quota_ctl.c,
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.
+ Remove 2.4 kernel code from lustre/mgc/mgc_request.c.
Severity : enhancement
Bugzilla : 13690
diff --git a/lustre/mgc/mgc_request.c b/lustre/mgc/mgc_request.c
index cfe7c8c29b..ee8cd3420d 100644
--- a/lustre/mgc/mgc_request.c
+++ b/lustre/mgc/mgc_request.c
@@ -675,14 +675,10 @@ static int mgc_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) {
/* REPLicator context */
case OBD_IOC_PARSE: {
@@ -716,11 +712,7 @@ static int mgc_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;
}
--
GitLab