* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
if (uc->mu_valid != UCRED_INIT) {
uc->mu_suppgids[0] = uc->mu_suppgids[1] = -1;
if (uc->mu_ginfo) {
- put_group_info(uc->mu_ginfo);
+ cfs_put_group_info(uc->mu_ginfo);
uc->mu_ginfo = NULL;
}
if (uc->mu_identity) {
}
}
-static int match_nosquash_list(struct rw_semaphore *sem,
- struct list_head *nidlist,
+static int match_nosquash_list(cfs_rw_semaphore_t *sem,
+ cfs_list_t *nidlist,
lnet_nid_t peernid)
{
int rc;
ENTRY;
- down_read(sem);
+ cfs_down_read(sem);
rc = cfs_match_nid(peernid, nidlist);
- up_read(sem);
+ cfs_up_read(sem);
RETURN(rc);
}
if (!remote && perm & CFS_SETGRP_PERM) {
if (pud->pud_ngroups) {
/* setgroups for local client */
- ucred->mu_ginfo = groups_alloc(pud->pud_ngroups);
+ ucred->mu_ginfo = cfs_groups_alloc(pud->pud_ngroups);
if (!ucred->mu_ginfo) {
CERROR("failed to alloc %d groups\n",
pud->pud_ngroups);
out:
if (rc) {
if (ucred->mu_ginfo) {
- put_group_info(ucred->mu_ginfo);
+ cfs_put_group_info(ucred->mu_ginfo);
ucred->mu_ginfo = NULL;
}
if (ucred->mu_identity) {
for (i = 0, lod = lmm->lmm_objects; i < stripe_count; i++, lod++) {
CDEBUG(level, "stripe %u idx %u subobj "LPX64"/"LPX64"\n",
i, le32_to_cpu(lod->l_ost_idx),
- le64_to_cpu(lod->l_object_gr),
+ le64_to_cpu(lod->l_object_seq),
le64_to_cpu(lod->l_object_id));
}
}
}
CDEBUG(D_INFO, "Shrink to md_size = %d cookie/acl_size = %d"
- " MDSCAPA = "LPX64", OSSCAPA = "LPX64"\n",
+ " MDSCAPA = %llx, OSSCAPA = %llx\n",
md_size, acl_size,
- body->valid & OBD_MD_FLMDSCAPA,
- body->valid & OBD_MD_FLOSSCAPA);
+ (unsigned long long)(body->valid & OBD_MD_FLMDSCAPA),
+ (unsigned long long)(body->valid & OBD_MD_FLOSSCAPA));
/*
&RMF_MDT_BODY,
&RMF_MDT_MD,
ATTR_ATTR_FLAG|ATTR_RAW|MDS_OPEN_OWNEROVERRIDE|
ATTR_FORCE|ATTR_KILL_SUID|ATTR_KILL_SGID);
if (in != 0)
- CERROR("Unknown attr bits: %#llx\n", in);
+ CERROR("Unknown attr bits: "LPX64"\n", in);
return out;
}
/* unpacking */
attr->la_valid = LA_MODE | LA_RDEV | LA_UID | LA_GID |
LA_CTIME | LA_MTIME | LA_ATIME;
memset(&sp->u, 0, sizeof(sp->u));
- sp->sp_cr_flags = rec->cr_flags;
+ sp->sp_cr_flags = get_mrc_cr_flags(rec);
sp->sp_ck_split = !!(rec->cr_bias & MDS_CHECK_SPLIT);
info->mti_cross_ref = !!(rec->cr_bias & MDS_CROSS_REF);
if (!info->mti_cross_ref) {
rr->rr_name = req_capsule_client_get(pill, &RMF_NAME);
- rr->rr_namelen = req_capsule_get_size(pill, &RMF_NAME, RCL_CLIENT) - 1;
+ rr->rr_namelen = req_capsule_get_size(pill, &RMF_NAME,
+ RCL_CLIENT) - 1;
LASSERT(rr->rr_name && rr->rr_namelen > 0);
} else {
rr->rr_name = NULL;
else
ma->ma_attr_flags &= ~MDS_VTX_BYPASS;
- if (lustre_msg_get_flags(mdt_info_req(info)->rq_reqmsg) & MSG_REPLAY)
- info->mti_spec.no_create = 1;
+ info->mti_spec.no_create = !!req_is_replay(mdt_info_req(info));
rc = mdt_dlmreq_unpack(info);
RETURN(rc);
else
ma->ma_attr_flags &= ~MDS_VTX_BYPASS;
- if (lustre_msg_get_flags(mdt_info_req(info)->rq_reqmsg) & MSG_REPLAY)
- info->mti_spec.no_create = 1;
+ info->mti_spec.no_create = !!req_is_replay(mdt_info_req(info));
rc = mdt_dlmreq_unpack(info);
RETURN(rc);
attr->la_valid = LA_MODE | LA_RDEV | LA_UID | LA_GID |
LA_CTIME | LA_MTIME | LA_ATIME;
memset(&info->mti_spec.u, 0, sizeof(info->mti_spec.u));
- info->mti_spec.sp_cr_flags = rec->cr_flags;
+ info->mti_spec.sp_cr_flags = get_mrc_cr_flags(rec);
+ /* Do not trigger ASSERTION if client miss to set such flags. */
+ if (unlikely(info->mti_spec.sp_cr_flags == 0))
+ RETURN(-EPROTO);
info->mti_replayepoch = rec->cr_ioepoch;
info->mti_spec.sp_ck_split = !!(rec->cr_bias & MDS_CHECK_SPLIT);
if (req_capsule_get_size(pill, &RMF_CAPA1, RCL_CLIENT))
mdt_set_capainfo(info, 0, rr->rr_fid1,
req_capsule_client_get(pill, &RMF_CAPA1));
- if ((lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY) &&
- (req_capsule_get_size(pill, &RMF_CAPA2, RCL_CLIENT))) {
+ if (req_is_replay(req) &&
+ req_capsule_get_size(pill, &RMF_CAPA2, RCL_CLIENT)) {
#if 0
mdt_set_capainfo(info, 1, rr->rr_fid2,
req_capsule_client_get(pill, &RMF_CAPA2));
RCL_CLIENT);
if (sp->u.sp_ea.eadatalen) {
sp->u.sp_ea.eadata = req_capsule_client_get(pill, &RMF_EADATA);
- if (lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY)
- sp->no_create = 1;
+ sp->no_create = !!req_is_replay(req);
}
RETURN(0);