if (name != NULL && (name[0] != '\0')) {
LASSERT(namelen > 0);
lh->mlh_pdo_hash = full_name_hash(name, namelen);
+ /* XXX Workaround for LU-2856
+ * Zero is a valid return value of full_name_hash, but several
+ * users of mlh_pdo_hash assume a non-zero hash value. We
+ * therefore map zero onto an arbitrary, but consistent
+ * value (1) to avoid problems further down the road. */
+ if (unlikely(!lh->mlh_pdo_hash))
+ lh->mlh_pdo_hash = 1;
} else {
LASSERT(namelen == 0);
lh->mlh_pdo_hash = 0ull;
ma->ma_som = &info->mti_u.som.data;
rc = mdt_attr_get_complex(info, o, ma);
- if (unlikely(rc)) {
- CERROR("getattr error for "DFID": %d\n",
- PFID(mdt_object_fid(o)), rc);
- RETURN(rc);
- }
+ if (unlikely(rc)) {
+ CERROR("%s: getattr error for "DFID": rc = %d\n",
+ mdt_obd_name(info->mti_mdt),
+ PFID(mdt_object_fid(o)), rc);
+ RETURN(rc);
+ }
is_root = lu_fid_eq(mdt_object_fid(o), &info->mti_mdt->mdt_md_root_fid);
rc = mdt_attr_get_lov(info, root, ma);
mdt_object_put(info->mti_env, root);
if (unlikely(rc)) {
- CERROR("getattr error for "DFID": %d\n",
- PFID(mdt_object_fid(o)), rc);
+ CERROR("%s: getattr error for "DFID": rc = %d\n",
+ mdt_obd_name(info->mti_mdt),
+ PFID(mdt_object_fid(o)), rc);
RETURN(rc);
}
}
repbody->eadatasize = ma->ma_lmv_size;
repbody->valid |= (OBD_MD_FLDIREA|OBD_MD_MEA);
}
- } else if (S_ISLNK(la->la_mode) &&
- reqbody->valid & OBD_MD_LINKNAME) {
- buffer->lb_buf = ma->ma_lmm;
- /* eadatasize from client includes NULL-terminator, so
- * there is no need to read it */
- buffer->lb_len = reqbody->eadatasize - 1;
- rc = mo_readlink(env, next, buffer);
- if (unlikely(rc <= 0)) {
- CERROR("readlink failed: %d\n", rc);
- rc = -EFAULT;
- } else {
+ } else if (S_ISLNK(la->la_mode) &&
+ reqbody->valid & OBD_MD_LINKNAME) {
+ buffer->lb_buf = ma->ma_lmm;
+ /* eadatasize from client includes NULL-terminator, so
+ * there is no need to read it */
+ buffer->lb_len = reqbody->eadatasize - 1;
+ rc = mo_readlink(env, next, buffer);
+ if (unlikely(rc <= 0)) {
+ CERROR("%s: readlink failed for "DFID": rc = %d\n",
+ mdt_obd_name(info->mti_mdt),
+ PFID(mdt_object_fid(o)), rc);
+ rc = -EFAULT;
+ } else {
int print_limit = min_t(int, CFS_PAGE_SIZE - 128, rc);
if (OBD_FAIL_CHECK(OBD_FAIL_MDS_READLINK_EPROTO))
* because client expects that */
repbody->eadatasize = rc + 1;
if (repbody->eadatasize != reqbody->eadatasize)
- CERROR("Read shorter symlink %d, expected %d\n",
- rc, reqbody->eadatasize - 1);
+ CDEBUG(D_INODE, "%s: Read shorter symlink %d "
+ "on "DFID ", expected %d\n",
+ mdt_obd_name(info->mti_mdt),
+ rc, PFID(mdt_object_fid(o)),
+ reqbody->eadatasize - 1);
/* NULL terminate */
((char *)ma->ma_lmm)[rc] = 0;
rc = 0;
} else if (rc == -EOPNOTSUPP) {
rc = 0;
- } else {
- CERROR("got acl size: %d\n", rc);
- }
+ } else {
+ CERROR("%s: unable to read "DFID
+ " ACL: rc = %d\n",
+ mdt_obd_name(info->mti_mdt),
+ PFID(mdt_object_fid(o)), rc);
+ }
} else {
repbody->aclsize = rc;
repbody->valid |= OBD_MD_FLACL;
/* Get lock from request for possible resent case. */
mdt_intent_fixup_resent(info, *lockp, &new_lock, lhc);
- ldlm_rep->lock_policy_res2 =
- mdt_getattr_name_lock(info, lhc, child_bits, ldlm_rep);
+ rc = mdt_getattr_name_lock(info, lhc, child_bits, ldlm_rep);
+ ldlm_rep->lock_policy_res2 = clear_serious(rc);
if (mdt_get_disposition(ldlm_rep, DISP_LOOKUP_NEG))
ldlm_rep->lock_policy_res2 = 0;
__u64 flags)
{
struct layout_intent *layout;
+ struct lu_fid *fid;
+ struct mdt_object *obj = NULL;
+ struct md_object *child = NULL;
int rc;
ENTRY;
RETURN(-EINVAL);
}
+ fid = &info->mti_tmp_fid2;
+ fid_build_from_res_name(fid, &(*lockp)->l_resource->lr_name);
+
+ obj = mdt_object_find(info->mti_env, info->mti_mdt, fid);
+ if (IS_ERR(obj))
+ RETURN(PTR_ERR(obj));
+
+ if (mdt_object_exists(obj) && !mdt_object_remote(obj)) {
+ child = mdt_object_child(obj);
+
+ /* get the length of lsm */
+ rc = mo_xattr_get(info->mti_env, child, &LU_BUF_NULL,
+ XATTR_NAME_LOV);
+
+ if (rc > info->mti_mdt->mdt_max_mdsize)
+ info->mti_mdt->mdt_max_mdsize = rc;
+ }
+
+ mdt_object_put(info->mti_env, obj);
+
(*lockp)->l_lvb_type = LVB_T_LAYOUT;
req_capsule_set_size(info->mti_pill, &RMF_DLM_LVB, RCL_SERVER,
ldlm_lvbo_size(*lockp));
RETURN(-EROFS);
}
if (rc == 0 && flv->it_act != NULL) {
- /* execute policy */
- rc = flv->it_act(opc, info, lockp, flags);
+ struct ldlm_reply *rep;
+
+ /* execute policy */
+ rc = flv->it_act(opc, info, lockp, flags);
+
+ rep = req_capsule_server_get(pill, &RMF_DLM_REP);
+ rep->lock_policy_res2 =
+ ptlrpc_status_hton(rep->lock_policy_res2);
} else {
rc = -EOPNOTSUPP;
}
struct lprocfs_static_vars lvars;
int rc;
+ CLASSERT(sizeof("0x0123456789ABCDEF:0x01234567:0x01234567") ==
+ FID_NOBRACE_LEN + 1);
+ CLASSERT(sizeof("[0x0123456789ABCDEF:0x01234567:0x01234567]") ==
+ FID_LEN + 1);
rc = lu_kmem_init(mdt_caches);
if (rc)
return rc;
git://git.whamcloud.com / fs / lustre-release.git / blobdiff