From 57d07dcd66a2310630f9f5a6319e5f93ceb95363 Mon Sep 17 00:00:00 2001 From: yury Date: Mon, 30 May 2005 07:42:57 +0000 Subject: [PATCH] - more compilation fixes after discussing them with Andreas --- lustre/cobd/cache_obd.c | 2 +- lustre/include/linux/lustre_net.h | 1 + lustre/lmv/lmv_obd.c | 2 +- lustre/lov/lov_obd.c | 5 +++-- lustre/mdc/mdc_request.c | 2 +- lustre/mds/handler.c | 12 ++++++------ lustre/osc/osc_request.c | 2 +- lustre/ptlrpc/client.c | 2 -- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lustre/cobd/cache_obd.c b/lustre/cobd/cache_obd.c index 939d1f4..9025798 100644 --- a/lustre/cobd/cache_obd.c +++ b/lustre/cobd/cache_obd.c @@ -239,7 +239,7 @@ cobd_disconnect(struct obd_export *exp, unsigned long flags) RETURN(rc); } -static int cobd_get_info(struct obd_export *exp, obd_count keylen, +static int cobd_get_info(struct obd_export *exp, __u32 keylen, void *key, __u32 *vallen, void *val) { struct obd_device *obd = class_exp2obd(exp); diff --git a/lustre/include/linux/lustre_net.h b/lustre/include/linux/lustre_net.h index f577bf1..f791734 100644 --- a/lustre/include/linux/lustre_net.h +++ b/lustre/include/linux/lustre_net.h @@ -870,6 +870,7 @@ int import_set_conn_priority(struct obd_import *imp, struct obd_uuid *uuid); /* ptlrpc/pinger.c */ int ptlrpc_pinger_add_import(struct obd_import *imp); int ptlrpc_pinger_del_import(struct obd_import *imp); +int ptlrpc_check_and_wait_suspend(struct ptlrpc_request *req); /* ptlrpc/ptlrpcd.c */ void ptlrpcd_wake(struct ptlrpc_request *req); diff --git a/lustre/lmv/lmv_obd.c b/lustre/lmv/lmv_obd.c index 3f41cee..d5eb364 100644 --- a/lustre/lmv/lmv_obd.c +++ b/lustre/lmv/lmv_obd.c @@ -96,7 +96,7 @@ static int lmv_set_mdc_active(struct lmv_obd *lmv, struct obd_uuid *uuid, CDEBUG(D_INFO, "lmv idx %d is %s conn "LPX64"\n", i, tgt->uuid.uuid, tgt->ltd_exp->exp_handle.h_cookie); - if (!strncmp((char *)uuid->uuid, (char *)tgt->uuid.uuid, sizeof(uuid->uuid))) + if (obd_uuid_equals(uuid, &tgt->uuid)) break; } diff --git a/lustre/lov/lov_obd.c b/lustre/lov/lov_obd.c index 8b7a564..9b1d96b 100644 --- a/lustre/lov/lov_obd.c +++ b/lustre/lov/lov_obd.c @@ -337,7 +337,8 @@ static int lov_set_osc_active(struct lov_obd *lov, struct obd_uuid *uuid, CDEBUG(D_INFO, "lov idx %d is %s conn "LPX64"\n", i, tgt->uuid.uuid, tgt->ltd_exp->exp_handle.h_cookie); - if (!strncmp((char *)uuid->uuid, (char *)tgt->uuid.uuid, sizeof(uuid->uuid))) + + if (obd_uuid_equals(uuid, &tgt->uuid)) break; } @@ -581,7 +582,7 @@ lov_del_obd(struct obd_device *obd, struct obd_uuid *uuidp, int index, int gen) RETURN(-EINVAL); } - if (strncmp((char *)uuidp->uuid, (char *)tgt->uuid.uuid, sizeof(uuidp->uuid))) { + if (!obd_uuid_equals(uuidp, &tgt->uuid)) { CERROR("LOV target UUID %s at index %d doesn't match %s.\n", tgt->uuid.uuid, index, uuidp->uuid); RETURN(-EINVAL); diff --git a/lustre/mdc/mdc_request.c b/lustre/mdc/mdc_request.c index 6a5100b..4fcfc0a 100644 --- a/lustre/mdc/mdc_request.c +++ b/lustre/mdc/mdc_request.c @@ -1214,7 +1214,7 @@ static struct obd_device *mdc_get_real_obd(struct obd_export *exp, RETURN(exp->exp_obd); } -static int mdc_get_info(struct obd_export *exp, obd_count keylen, +static int mdc_get_info(struct obd_export *exp, __u32 keylen, void *key, __u32 *valsize, void *val) { struct ptlrpc_request *req; diff --git a/lustre/mds/handler.c b/lustre/mds/handler.c index db9f070..f81b930 100644 --- a/lustre/mds/handler.c +++ b/lustre/mds/handler.c @@ -2370,24 +2370,24 @@ static int mdt_get_info(struct ptlrpc_request *req) if (keylen >= strlen("rootid") && !strcmp(key, "rootid")) { struct lustre_id *reply; - __u32 size = sizeof(*reply); + int size = sizeof(*reply); - rc = lustre_pack_reply(req, 1, (int *)&size, NULL); + rc = lustre_pack_reply(req, 1, &size, NULL); if (rc) RETURN(rc); reply = lustre_msg_buf(req->rq_repmsg, 0, size); - rc = obd_get_info(exp, keylen, key, &size, reply); + rc = obd_get_info(exp, keylen, key, (__u32 *)&size, reply); } else { obd_id *reply; - __u32 size = sizeof(*reply); + int size = sizeof(*reply); - rc = lustre_pack_reply(req, 1, (int *)&size, NULL); + rc = lustre_pack_reply(req, 1, &size, NULL); if (rc) RETURN(rc); reply = lustre_msg_buf(req->rq_repmsg, 0, size); - rc = obd_get_info(exp, keylen, key, &size, reply); + rc = obd_get_info(exp, keylen, key, (__u32 *)&size, reply); } req->rq_repmsg->status = 0; diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c index f311b04..f121394 100644 --- a/lustre/osc/osc_request.c +++ b/lustre/osc/osc_request.c @@ -2803,7 +2803,7 @@ out: return err; } -static int osc_get_info(struct obd_export *exp, obd_count keylen, +static int osc_get_info(struct obd_export *exp, __u32 keylen, void *key, __u32 *vallen, void *val) { ENTRY; diff --git a/lustre/ptlrpc/client.c b/lustre/ptlrpc/client.c index f24a028..349e218 100644 --- a/lustre/ptlrpc/client.c +++ b/lustre/ptlrpc/client.c @@ -1375,8 +1375,6 @@ void ptlrpc_retain_replayable_request(struct ptlrpc_request *req, list_add_tail(&req->rq_replay_list, &imp->imp_replay_list); } -int ptlrpc_check_and_wait_suspend(struct ptlrpc_request *req); - int ptlrpc_queue_wait(struct ptlrpc_request *req) { char str[PTL_NALFMT_SIZE]; -- 1.8.3.1