From 536f1a6294569f8638f372c9e17a4fb2bf829313 Mon Sep 17 00:00:00 2001 From: "John L. Hammond" Date: Tue, 2 Jul 2013 17:57:09 -0500 Subject: [PATCH] LU-3500 mdt: use __u64 for sp_cr_flags In mdt_reconstruct_open() and mdt_open_by_fid(), when storing a copy of the sp_cr_flags member of struct md_op_spec on the stack use __u64 rather than __u32. In mdd_create_data() use LPO64 for printing sp_cr_flags. Signed-off-by: John L. Hammond Change-Id: Icaaafe537e9f9dea3934d6c85332d0a355299e25 Reviewed-on: http://review.whamcloud.com/6868 Tested-by: Hudson Tested-by: Maloo Reviewed-by: Fan Yong Reviewed-by: wangdi Reviewed-by: Oleg Drokin --- lustre/mdd/mdd_dir.c | 2 +- lustre/mdt/mdt_open.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/lustre/mdd/mdd_dir.c b/lustre/mdd/mdd_dir.c index 8048d11..8321f36 100644 --- a/lustre/mdd/mdd_dir.c +++ b/lustre/mdd/mdd_dir.c @@ -1638,7 +1638,7 @@ static int mdd_create_data(const struct lu_env *env, struct md_object *pobj, * XXX: Setting the lov ea is not locked but setting the attr is locked? * Should this be fixed? */ - CDEBUG(D_OTHER, "ea %p/%u, cr_flags %Lo, no_create %u\n", + CDEBUG(D_OTHER, "ea %p/%u, cr_flags "LPO64", no_create %u\n", spec->u.sp_ea.eadata, spec->u.sp_ea.eadatalen, spec->sp_cr_flags, spec->no_create); diff --git a/lustre/mdt/mdt_open.c b/lustre/mdt/mdt_open.c index 5c7a1df..0d4b3d3 100644 --- a/lustre/mdt/mdt_open.c +++ b/lustre/mdt/mdt_open.c @@ -1003,7 +1003,7 @@ void mdt_reconstruct_open(struct mdt_thread_info *info, struct lsd_client_data *lcd = ted->ted_lcd; struct md_attr *ma = &info->mti_attr; struct mdt_reint_record *rr = &info->mti_rr; - __u32 flags = info->mti_spec.sp_cr_flags; + __u64 flags = info->mti_spec.sp_cr_flags; struct ldlm_reply *ldlm_rep; struct mdt_object *parent; struct mdt_object *child; @@ -1109,10 +1109,9 @@ out: LASSERT(ergo(rc < 0, lustre_msg_get_transno(req->rq_repmsg) == 0)); } -int mdt_open_by_fid(struct mdt_thread_info* info, - struct ldlm_reply *rep) +int mdt_open_by_fid(struct mdt_thread_info *info, struct ldlm_reply *rep) { - __u32 flags = info->mti_spec.sp_cr_flags; + __u64 flags = info->mti_spec.sp_cr_flags; struct mdt_reint_record *rr = &info->mti_rr; struct md_attr *ma = &info->mti_attr; struct mdt_object *o; -- 1.8.3.1