* in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see [sun.com URL with a
- * copy of GPLv2].
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
*
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* 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.
*/
/*
struct cmm_device *d,
const struct lu_fid *f)
{
- struct lu_object *o;
- struct cmm_object *m;
- ENTRY;
-
- o = lu_object_find(env, d->cmm_md_dev.md_lu_dev.ld_site, f);
- if (IS_ERR(o))
- m = (struct cmm_object *)o;
- else
- m = lu2cmm_obj(lu_object_locate(o->lo_header,
- d->cmm_md_dev.md_lu_dev.ld_type));
- RETURN(m);
+ return md2cmm_obj(md_object_find_slice(env, &d->cmm_md_dev, fid));
}
static inline void cmm_object_put(const struct lu_env *env,
LASSERT(cmm != NULL && mc != NULL && fid != NULL);
- down(&mc->mc_fid_sem);
+ cfs_down(&mc->mc_fid_sem);
/* Alloc new fid on @mc. */
rc = obd_fid_alloc(mc->mc_desc.cl_exp, fid, NULL);
- if (rc > 0) {
- /* Setup FLD for new sequenceif needed. */
- rc = fld_client_create(cmm->cmm_fld, fid_seq(fid),
- mc->mc_num, env);
- if (rc)
- CERROR("Can't create fld entry, rc %d\n", rc);
- }
- up(&mc->mc_fid_sem);
+ if (rc > 0)
+ rc = 0;
+ cfs_up(&mc->mc_fid_sem);
RETURN(rc);
}
slave_lmv->mea_magic = MEA_MAGIC_HASH_SEGMENT;
slave_lmv->mea_count = 0;
- list_for_each_entry_safe(mc, tmp, &cmm->cmm_targets, mc_linkage) {
+ cfs_list_for_each_entry_safe(mc, tmp, &cmm->cmm_targets, mc_linkage) {
rc = cmm_split_slave_create(env, cmm, mc, &lmv->mea_ids[i],
ma, slave_lmv, sizeof(*slave_lmv));
if (rc)
GOTO(cleanup, rc);
i++;
}
-
- ma->ma_valid |= MA_LMV;
EXIT;
cleanup:
return rc;
cmi = cmm_env_info(env);
lname = &cmi->cti_name;
lname->ln_name = name;
- /* NOT count the terminating '\0' of name for length */
+ /* do NOT count the terminating '\0' of name for length */
lname->ln_namelen = buflen - 1;
return lname;
}
{
struct cmm_device *cmm = cmm_obj2dev(md2cmm_obj(mo));
struct cmm_thread_info *cmi;
- struct md_attr *ma;
+ struct md_attr *ma;
struct cmm_object *obj;
int is_dir, rc;
char *name;
/*
* XXX: These days only cross-ref dirs are possible, so for the
* sake of simplicity, in split, we suppose that all cross-ref
- * names pint to directory and do not do additional getattr to
+ * names point to directory and do not do additional getattr to
* remote MDT.
*/
is_dir = 1;
{
struct cmm_device *cmm = cmm_obj2dev(md2cmm_obj(mo));
struct lu_rdpg *rdpg = &cmm_env_info(env)->cmi_rdpg;
- __u64 hash_segement;
+ __u64 hash_segment;
int rc = 0, i;
ENTRY;
GOTO(cleanup, rc = -ENOMEM);
}
- LASSERT(ma->ma_valid & MA_LMV);
- hash_segement = MAX_HASH_SIZE / (cmm->cmm_tgt_count + 1);
+ hash_segment = MAX_HASH_SIZE;
+ do_div(hash_segment, cmm->cmm_tgt_count + 1);
for (i = 1; i < cmm->cmm_tgt_count + 1; i++) {
struct lu_fid *lf;
__u64 hash_end;
lf = &ma->ma_lmv->mea_ids[i];
- rdpg->rp_hash = i * hash_segement;
+ rdpg->rp_hash = i * hash_segment;
if (i == cmm->cmm_tgt_count)
hash_end = MAX_HASH_SIZE;
else
- hash_end = rdpg->rp_hash + hash_segement;
+ hash_end = rdpg->rp_hash + hash_segment;
rc = cmm_split_process_stripe(env, mo, rdpg, lf, hash_end);
if (rc) {
CERROR("Error (rc = %d) while splitting for %d: fid="
- DFID", %08x:%08x\n", rc, i, PFID(lf),
+ DFID", "LPX64":"LPX64"\n", rc, i, PFID(lf),
rdpg->rp_hash, hash_end);
GOTO(cleanup, rc);
}
cleanup:
for (i = 0; i < rdpg->rp_npages; i++)
if (rdpg->rp_pages[i] != NULL)
- __cfs_free_page(rdpg->rp_pages[i]);
+ cfs_free_page(rdpg->rp_pages[i]);
return rc;
}
* Disable transacrions for split, since there will be so many trans in
* this one ops, conflict with current recovery design.
*/
- rc = cmm_upcall(env, &cmm->cmm_md_dev, MD_NO_TRANS);
+ rc = cmm_upcall(env, &cmm->cmm_md_dev, MD_NO_TRANS, NULL);
if (rc) {
CERROR("Can't disable trans for split, rc %d\n", rc);
GOTO(out, rc);
}
/* Step5: Set mea to the master object. */
- LASSERT(ma->ma_valid & MA_LMV);
buf = cmm_buf_get(env, ma->ma_lmv, ma->ma_lmv_size);
rc = mo_xattr_set(env, md_object_next(mo), buf,
MDS_LMV_MD_NAME, 0);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff