From 349dfb667158d22989f9ce2edca9bdfa623f8a04 Mon Sep 17 00:00:00 2001 From: ericm Date: Mon, 18 Sep 2006 20:10:14 +0000 Subject: [PATCH] branch: b_new_cmd fix according to nikita's suggestion: - rename ptlrpc_flavor_t => ptlrpc_sec_flavor_t - use OBD_ALLOC_PTR/OBD_FREE_PTR - use "=" to assign structure instead of memcpy() --- lustre/autoconf/lustre-core.m4 | 8 ++++---- lustre/include/lustre_net.h | 2 +- lustre/include/lustre_sec.h | 2 +- lustre/ldlm/ldlm_lib.c | 8 ++++---- lustre/ptlrpc/gss/gss_cli_upcall.c | 6 +++--- lustre/ptlrpc/gss/gss_krb5_mech.c | 10 +++++----- lustre/ptlrpc/gss/gss_mech_switch.c | 8 ++++---- lustre/ptlrpc/gss/sec_gss.c | 8 ++++---- lustre/ptlrpc/sec.c | 12 ++++++------ 9 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4 index 19edffa..5b75e09 100644 --- a/lustre/autoconf/lustre-core.m4 +++ b/lustre/autoconf/lustre-core.m4 @@ -654,10 +654,10 @@ AC_ARG_ENABLE([gss], [enable gss/krb5 support]), [enable_gss='yes'],[enable_gss='no']) AC_MSG_RESULT([$enable_gss]) -#if test x$enable_gss != xno; then -# PKG_CHECK_MODULES([GSSAPI], [libgssapi >= 0.10]) -# AC_KERBEROS_V5 -#fi +if test x$enable_gss != xno; then + PKG_CHECK_MODULES([GSSAPI], [libgssapi >= 0.10]) + AC_KERBEROS_V5 +fi ]) # diff --git a/lustre/include/lustre_net.h b/lustre/include/lustre_net.h index 1356fbf..0b6818d 100644 --- a/lustre/include/lustre_net.h +++ b/lustre/include/lustre_net.h @@ -353,7 +353,7 @@ struct ptlrpc_request { struct ptlrpc_cli_ctx *rq_cli_ctx; /* client's half ctx */ struct ptlrpc_svc_ctx *rq_svc_ctx; /* server's half ctx */ struct list_head rq_ctx_chain; /* link to waited ctx */ - ptlrpc_flavor_t rq_sec_flavor; /* client & server */ + ptlrpc_sec_flavor_t rq_sec_flavor; /* client & server */ /* client security flags */ unsigned int rq_ctx_init:1, /* context initiation */ rq_ctx_fini:1, /* context destroy */ diff --git a/lustre/include/lustre_sec.h b/lustre/include/lustre_sec.h index 1170cc5..388d583 100644 --- a/lustre/include/lustre_sec.h +++ b/lustre/include/lustre_sec.h @@ -79,7 +79,7 @@ enum sptlrpc_service_type { * flavor compose/extract */ -typedef __u32 ptlrpc_flavor_t; +typedef __u32 ptlrpc_sec_flavor_t; /* * 8b (reserved) | 8b (flags) | 6b (policy) | 6b (subpolicy) | 4b (svc) diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c index 1bdaff4..284d1d4 100644 --- a/lustre/ldlm/ldlm_lib.c +++ b/lustre/ldlm/ldlm_lib.c @@ -882,17 +882,17 @@ struct ptlrpc_request *target_save_req(struct ptlrpc_request *src) struct ptlrpc_request *req; struct lustre_msg *reqmsg; - OBD_ALLOC(req, sizeof(*req)); + OBD_ALLOC_PTR(req); if (!req) return NULL; OBD_ALLOC(reqmsg, src->rq_reqlen); if (!reqmsg) { - OBD_FREE(req, sizeof(*req)); + OBD_FREE_PTR(req); return NULL; } - memcpy(req, src, sizeof(*req)); + *req = *src; memcpy(reqmsg, src->rq_reqmsg, src->rq_reqlen); req->rq_reqmsg = reqmsg; @@ -922,7 +922,7 @@ void target_release_saved_req(struct ptlrpc_request *req) class_export_put(req->rq_export); OBD_FREE(req->rq_reqmsg, req->rq_reqlen); - OBD_FREE(req, sizeof(*req)); + OBD_FREE_PTR(req); } static void target_finish_recovery(struct obd_device *obd) diff --git a/lustre/ptlrpc/gss/gss_cli_upcall.c b/lustre/ptlrpc/gss/gss_cli_upcall.c index 0a61dfe..f9afadb 100644 --- a/lustre/ptlrpc/gss/gss_cli_upcall.c +++ b/lustre/ptlrpc/gss/gss_cli_upcall.c @@ -156,7 +156,7 @@ void gss_release_msg(struct gss_upcall_msg *gmsg) LASSERT(list_empty(&gmsg->gum_list)); LASSERT(list_empty(&gmsg->gum_base.list)); - OBD_FREE(gmsg, sizeof(*gmsg)); + OBD_FREE_PTR(gmsg); EXIT; } @@ -503,7 +503,7 @@ int gss_ctx_refresh_pipefs(struct ptlrpc_cli_ctx *ctx) gsec = container_of(ctx->cc_sec, struct gss_sec, gs_base); - OBD_ALLOC(gmsg, sizeof(*gmsg)); + OBD_ALLOC_PTR(gmsg); if (!gmsg) RETURN(-ENOMEM); @@ -557,7 +557,7 @@ int gss_ctx_refresh_pipefs(struct ptlrpc_cli_ctx *ctx) RETURN(0); err_free: - OBD_FREE(gmsg, sizeof(*gmsg)); + OBD_FREE_PTR(gmsg); RETURN(rc); } diff --git a/lustre/ptlrpc/gss/gss_krb5_mech.c b/lustre/ptlrpc/gss/gss_krb5_mech.c index 8b69a05..1360fc4 100644 --- a/lustre/ptlrpc/gss/gss_krb5_mech.c +++ b/lustre/ptlrpc/gss/gss_krb5_mech.c @@ -403,7 +403,7 @@ __u32 gss_import_sec_context_kerberos(rawobj_t *inbuf, return GSS_S_FAILURE; } - OBD_ALLOC(kctx, sizeof(*kctx)); + OBD_ALLOC_PTR(kctx); if (!kctx) return GSS_S_FAILURE; @@ -419,7 +419,7 @@ __u32 gss_import_sec_context_kerberos(rawobj_t *inbuf, if (rc) { delete_context_kerberos(kctx); - OBD_FREE(kctx, sizeof(*kctx)); + OBD_FREE_PTR(kctx); return GSS_S_FAILURE; } @@ -435,7 +435,7 @@ __u32 gss_copy_reverse_context_kerberos(struct gss_ctx *gctx, struct krb5_ctx *kctx = gctx->internal_ctx_id; struct krb5_ctx *knew; - OBD_ALLOC(knew, sizeof(*knew)); + OBD_ALLOC_PTR(knew); if (!knew) return GSS_S_FAILURE; @@ -465,7 +465,7 @@ __u32 gss_copy_reverse_context_kerberos(struct gss_ctx *gctx, out_err: delete_context_kerberos(knew); - OBD_FREE(knew, sizeof(*knew)); + OBD_FREE_PTR(knew); return GSS_S_FAILURE; } @@ -485,7 +485,7 @@ void gss_delete_sec_context_kerberos(void *internal_ctx) struct krb5_ctx *kctx = internal_ctx; delete_context_kerberos(kctx); - OBD_FREE(kctx, sizeof(*kctx)); + OBD_FREE_PTR(kctx); } static diff --git a/lustre/ptlrpc/gss/gss_mech_switch.c b/lustre/ptlrpc/gss/gss_mech_switch.c index a6493d2..b09cdee 100644 --- a/lustre/ptlrpc/gss/gss_mech_switch.c +++ b/lustre/ptlrpc/gss/gss_mech_switch.c @@ -153,7 +153,7 @@ __u32 lgss_import_sec_context(rawobj_t *input_token, struct gss_api_mech *mech, struct gss_ctx **ctx_id) { - OBD_ALLOC(*ctx_id, sizeof(**ctx_id)); + OBD_ALLOC_PTR(*ctx_id); if (*ctx_id == NULL) return GSS_S_FAILURE; @@ -173,7 +173,7 @@ __u32 lgss_copy_reverse_context(struct gss_ctx *ctx_id, LASSERT(mech); - OBD_ALLOC(*ctx_id_new, sizeof(**ctx_id_new)); + OBD_ALLOC_PTR(*ctx_id_new); if (*ctx_id_new == NULL) return GSS_S_FAILURE; @@ -186,7 +186,7 @@ __u32 lgss_copy_reverse_context(struct gss_ctx *ctx_id, major = mech->gm_ops->gss_copy_reverse_context(ctx_id, *ctx_id_new); if (major != GSS_S_COMPLETE) { lgss_mech_put(mech); - OBD_FREE(*ctx_id_new, sizeof(**ctx_id_new)); + OBD_FREE_PTR(*ctx_id_new); *ctx_id_new = NULL; } return major; @@ -326,7 +326,7 @@ __u32 lgss_delete_sec_context(struct gss_ctx **context_handle) if (mech) lgss_mech_put(mech); - OBD_FREE(*context_handle, sizeof(**context_handle)); + OBD_FREE_PTR(*context_handle); *context_handle=NULL; return GSS_S_COMPLETE; } diff --git a/lustre/ptlrpc/gss/sec_gss.c b/lustre/ptlrpc/gss/sec_gss.c index 21bc96f..f5f7018 100644 --- a/lustre/ptlrpc/gss/sec_gss.c +++ b/lustre/ptlrpc/gss/sec_gss.c @@ -960,7 +960,7 @@ struct ptlrpc_cli_ctx * gss_sec_create_ctx(struct ptlrpc_sec *sec, struct ptlrpc_cli_ctx *ctx; ENTRY; - OBD_ALLOC(gctx, sizeof(*gctx)); + OBD_ALLOC_PTR(gctx); if (!gctx) RETURN(NULL); @@ -1001,7 +1001,7 @@ void gss_sec_destroy_ctx(struct ptlrpc_sec *sec, struct ptlrpc_cli_ctx *ctx) ctx->cc_sec->ps_policy->sp_name, ctx->cc_sec, ctx, ctx->cc_vcred.vc_uid, sec2target_str(ctx->cc_sec)); - OBD_FREE(gctx, sizeof(*gctx)); + OBD_FREE_PTR(gctx); EXIT; } @@ -1424,7 +1424,7 @@ void gss_svc_reqctx_free(struct gss_svc_reqctx *grctx) gss_svc_upcall_put_ctx(grctx->src_ctx); sptlrpc_policy_put(grctx->src_base.sc_policy); - OBD_FREE(grctx, sizeof(*grctx)); + OBD_FREE_PTR(grctx); } static inline @@ -1860,7 +1860,7 @@ int gss_svc_accept(struct ptlrpc_request *req) } /* alloc grctx data */ - OBD_ALLOC(grctx, sizeof(*grctx)); + OBD_ALLOC_PTR(grctx); if (!grctx) { CERROR("fail to alloc svc reqctx\n"); RETURN(SECSVC_DROP); diff --git a/lustre/ptlrpc/sec.c b/lustre/ptlrpc/sec.c index 474a7b3..3fc9c93 100644 --- a/lustre/ptlrpc/sec.c +++ b/lustre/ptlrpc/sec.c @@ -103,7 +103,7 @@ int sptlrpc_unregister_policy(struct ptlrpc_sec_policy *policy) EXPORT_SYMBOL(sptlrpc_unregister_policy); static -struct ptlrpc_sec_policy * sptlrpc_flavor2policy(ptlrpc_flavor_t flavor) +struct ptlrpc_sec_policy * sptlrpc_flavor2policy(ptlrpc_sec_flavor_t flavor) { static int load_module = 0; struct ptlrpc_sec_policy *policy; @@ -130,7 +130,7 @@ again: return policy; } -ptlrpc_flavor_t sptlrpc_name2flavor(const char *name) +ptlrpc_sec_flavor_t sptlrpc_name2flavor(const char *name) { if (!strcmp(name, "null")) return SPTLRPC_FLVR_NULL; @@ -147,7 +147,7 @@ ptlrpc_flavor_t sptlrpc_name2flavor(const char *name) } EXPORT_SYMBOL(sptlrpc_name2flavor); -char *sptlrpc_flavor2name(ptlrpc_flavor_t flavor) +char *sptlrpc_flavor2name(ptlrpc_sec_flavor_t flavor) { switch (flavor) { case SPTLRPC_FLVR_NULL: @@ -1016,7 +1016,7 @@ int sptlrpc_import_check_ctx(struct obd_import *imp) RETURN(0); } - OBD_ALLOC(req, sizeof(*req)); + OBD_ALLOC_PTR(req); if (!req) RETURN(-ENOMEM); @@ -1030,7 +1030,7 @@ int sptlrpc_import_check_ctx(struct obd_import *imp) rc = sptlrpc_req_refresh_ctx(req, 0); LASSERT(list_empty(&req->rq_ctx_chain)); sptlrpc_ctx_put(req->rq_cli_ctx, 1); - OBD_FREE(req, sizeof(*req)); + OBD_FREE_PTR(req); RETURN(rc); } @@ -1111,7 +1111,7 @@ int sptlrpc_cli_unwrap_reply(struct ptlrpc_request *req) } } else { /* v2 message... */ - ptlrpc_flavor_t tmpf = req->rq_repbuf->lm_secflvr; + ptlrpc_sec_flavor_t tmpf = req->rq_repbuf->lm_secflvr; if (req->rq_repbuf->lm_magic == LUSTRE_MSG_MAGIC_V2_SWABBED) __swab32s(&tmpf); -- 1.8.3.1