From 19d509e48955de294ebdd9e4773208dd686f3095 Mon Sep 17 00:00:00 2001
From: adilger <adilger>
Date: Wed, 15 Oct 2008 07:57:11 +0000
Subject: [PATCH] Branch b1_6 Backport warning fixes from b1_8. i=girish
(original patch) i=robert
---
lustre/include/lustre_net.h | 3 +++
lustre/ldlm/ldlm_request.c | 2 +-
lustre/osc/osc_request.c | 20 ++++++++++----------
lustre/ptlrpc/client.c | 4 ++--
lustre/ptlrpc/import.c | 2 +-
5 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/lustre/include/lustre_net.h b/lustre/include/lustre_net.h
index 160be77fca..54c43ce515 100644
--- a/lustre/include/lustre_net.h
+++ b/lustre/include/lustre_net.h
@@ -155,6 +155,9 @@
#define OST_MAXREQSIZE (5 * 1024)
#define OST_MAXREPSIZE (9 * 1024)
+/* Macro to hide a typecast. */
+#define ptlrpc_req_async_args(req) ((void *)&req->rq_async_args)
+
struct ptlrpc_connection {
struct hlist_node c_hash;
lnet_nid_t c_self;
diff --git a/lustre/ldlm/ldlm_request.c b/lustre/ldlm/ldlm_request.c
index d8a88fe817..d25b55d0e3 100644
--- a/lustre/ldlm/ldlm_request.c
+++ b/lustre/ldlm/ldlm_request.c
@@ -1993,7 +1993,7 @@ static int replay_one_lock(struct obd_import *imp, struct ldlm_lock *lock)
atomic_inc(&req->rq_import->imp_replay_inflight);
CLASSERT(sizeof(*aa) <= sizeof(req->rq_async_args));
- aa = (struct ldlm_async_args *)&req->rq_async_args;
+ aa = ptlrpc_req_async_args(req);
aa->lock_handle = body->lock_handle[0];
req->rq_interpret_reply = replay_lock_interpret;
ptlrpcd_add_req(req);
diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index b6ec637cd4..f21351cb43 100644
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -212,7 +212,7 @@ static int osc_getattr_async(struct obd_export *exp, struct obd_info *oinfo,
req->rq_interpret_reply = osc_getattr_interpret;
CLASSERT(sizeof(*aa) <= sizeof(req->rq_async_args));
- aa = (struct osc_async_args *)&req->rq_async_args;
+ aa = ptlrpc_req_async_args(req);
aa->aa_oi = oinfo;
ptlrpc_set_add_req(set, req);
@@ -353,7 +353,7 @@ static int osc_setattr_async(struct obd_export *exp, struct obd_info *oinfo,
req->rq_interpret_reply = osc_setattr_interpret;
CLASSERT(sizeof(*aa) <= sizeof(req->rq_async_args));
- aa = (struct osc_async_args *)&req->rq_async_args;
+ aa = ptlrpc_req_async_args(req);
aa->aa_oi = oinfo;
ptlrpc_set_add_req(rqset, req);
@@ -500,7 +500,7 @@ static int osc_punch(struct obd_export *exp, struct obd_info *oinfo,
req->rq_interpret_reply = osc_punch_interpret;
CLASSERT(sizeof(*aa) <= sizeof(req->rq_async_args));
- aa = (struct osc_async_args *)&req->rq_async_args;
+ aa = ptlrpc_req_async_args(req);
aa->aa_oi = oinfo;
ptlrpc_set_add_req(rqset, req);
@@ -1104,7 +1104,7 @@ static int osc_brw_prep_request(int cmd, struct client_obd *cli,struct obdo *oa,
}
CLASSERT(sizeof(*aa) <= sizeof(req->rq_async_args));
- aa = (struct osc_brw_async_args *)&req->rq_async_args;
+ aa = ptlrpc_req_async_args(req);
aa->aa_oa = oa;
aa->aa_requested_nob = requested_nob;
aa->aa_nio_count = niocount;
@@ -1410,7 +1410,7 @@ int osc_brw_redo_request(struct ptlrpc_request *request,
new_req->rq_async_args = request->rq_async_args;
new_req->rq_sent = CURRENT_SECONDS + aa->aa_resends;
- new_aa = (struct osc_brw_async_args *)&new_req->rq_async_args;
+ new_aa = ptlrpc_req_async_args(new_req);
CFS_INIT_LIST_HEAD(&new_aa->aa_oaps);
list_splice(&aa->aa_oaps, &new_aa->aa_oaps);
@@ -1459,7 +1459,7 @@ static int async_internal(int cmd, struct obd_export *exp, struct obdo *oa,
rc = osc_brw_prep_request(cmd, &exp->exp_obd->u.cli, oa, lsm,
page_count, pga, &request);
- aa = (struct osc_brw_async_args *)&request->rq_async_args;
+ aa = ptlrpc_req_async_args(request);
if (cmd == OBD_BRW_READ) {
lprocfs_oh_tally_log2(&cli->cl_read_page_hist, page_count);
lprocfs_oh_tally(&cli->cl_read_rpc_hist, cli->cl_r_in_flight);
@@ -2053,7 +2053,7 @@ static struct ptlrpc_request *osc_build_req(struct client_obd *cli,
OBD_MD_FLMTIME | OBD_MD_FLCTIME | OBD_MD_FLATIME);
CLASSERT(sizeof(*aa) <= sizeof(req->rq_async_args));
- aa = (struct osc_brw_async_args *)&req->rq_async_args;
+ aa = ptlrpc_req_async_args(req);
CFS_INIT_LIST_HEAD(&aa->aa_oaps);
list_splice(rpc_list, &aa->aa_oaps);
CFS_INIT_LIST_HEAD(rpc_list);
@@ -2243,7 +2243,7 @@ static int osc_send_oap_rpc(struct client_obd *cli, struct lov_oinfo *loi,
RETURN(PTR_ERR(req));
}
- aa = (struct osc_brw_async_args *)&req->rq_async_args;
+ aa = ptlrpc_req_async_args(req);
if (cmd == OBD_BRW_READ) {
lprocfs_oh_tally_log2(&cli->cl_read_page_hist, page_count);
lprocfs_oh_tally(&cli->cl_read_rpc_hist, cli->cl_r_in_flight);
@@ -3088,7 +3088,7 @@ static int osc_enqueue(struct obd_export *exp, struct obd_info *oinfo,
if (!rc) {
struct osc_enqueue_args *aa;
CLASSERT(sizeof(*aa) <= sizeof(req->rq_async_args));
- aa = (struct osc_enqueue_args *)&req->rq_async_args;
+ aa = ptlrpc_req_async_args(req);
aa->oa_oi = oinfo;
aa->oa_ei = einfo;
aa->oa_exp = exp;
@@ -3230,7 +3230,7 @@ static int osc_statfs_async(struct obd_device *obd, struct obd_info *oinfo,
req->rq_interpret_reply = osc_statfs_interpret;
CLASSERT(sizeof(*aa) <= sizeof(req->rq_async_args));
- aa = (struct osc_async_args *)&req->rq_async_args;
+ aa = ptlrpc_req_async_args(req);
aa->aa_oi = oinfo;
ptlrpc_set_add_req(rqset, req);
diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c
index 059891119a..0ab317f0c2 100644
--- a/lustre/ptlrpc/client.c
+++ b/lustre/ptlrpc/client.c
@@ -2044,8 +2044,8 @@ int ptlrpc_replay_req(struct ptlrpc_request *req)
/* Not handling automatic bulk replay yet (or ever?) */
LASSERT(req->rq_bulk == NULL);
- LASSERT (sizeof (*aa) <= sizeof (req->rq_async_args));
- aa = (struct ptlrpc_replay_async_args *)&req->rq_async_args;
+ CLASSERT(sizeof (*aa) <= sizeof (req->rq_async_args));
+ aa = ptlrpc_req_async_args(req);
memset(aa, 0, sizeof *aa);
/* Prepare request to be resent with ptlrpcd */
diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c
index 328a2c9e38..a032cbca17 100644
--- a/lustre/ptlrpc/import.c
+++ b/lustre/ptlrpc/import.c
@@ -553,7 +553,7 @@ int ptlrpc_connect_import(struct obd_import *imp, char *new_uuid)
request->rq_interpret_reply = ptlrpc_connect_interpret;
CLASSERT(sizeof (*aa) <= sizeof (request->rq_async_args));
- aa = (struct ptlrpc_connect_async_args *)&request->rq_async_args;
+ aa = ptlrpc_req_async_args(request);
memset(aa, 0, sizeof *aa);
aa->pcaa_peer_committed = committed_before_reconnect;
--
GitLab