* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
r0->lo_sub[idx]->lso_index = idx;
result = 0;
} else {
- CERROR("Stripe is already owned by other file (%i).\n", idx);
+ CERROR("Stripe is already owned by other file (%d).\n", idx);
LU_OBJECT_DEBUG(D_ERROR, env, &stripe->co_lu, "\n");
LU_OBJECT_DEBUG(D_ERROR, env, lu_object_top(&parent->coh_lu),
"old\n");
r0->lo_lsm = conf->u.coc_md->lsm;
LASSERT(r0->lo_nr <= lov_targets_nr(dev));
- OBD_ALLOC(r0->lo_sub, r0->lo_nr * sizeof r0->lo_sub[0]);
+ OBD_ALLOC_LARGE(r0->lo_sub, r0->lo_nr * sizeof r0->lo_sub[0]);
if (r0->lo_sub != NULL) {
result = 0;
subconf->coc_inode = conf->coc_inode;
struct cl_object *sub;
struct lov_layout_raid0 *r0;
struct lu_site *site;
+ struct lu_site_bkt_data *bkt;
cfs_waitlink_t *waiter;
r0 = &lov->u.raid0;
sub = lovsub2cl(los);
site = sub->co_lu.lo_dev->ld_site;
+ bkt = lu_site_bkt_from_fid(site, &sub->co_lu.lo_header->loh_fid);
cl_object_kill(env, sub);
/* release a reference to the sub-object and ... */
if (r0->lo_sub[idx] == los) {
waiter = &lov_env_info(env)->lti_waiter;
cfs_waitlink_init(waiter);
- cfs_waitq_add(&site->ls_marche_funebre, waiter);
+ cfs_waitq_add(&bkt->lsb_marche_funebre, waiter);
cfs_set_current_state(CFS_TASK_UNINT);
while (1) {
/* this wait-queue is signaled at the end of
break;
}
}
- cfs_waitq_del(&site->ls_marche_funebre, waiter);
+ cfs_waitq_del(&bkt->lsb_marche_funebre, waiter);
}
LASSERT(r0->lo_sub[idx] == NULL);
}
ENTRY;
if (r0->lo_sub != NULL) {
- OBD_FREE(r0->lo_sub, r0->lo_nr * sizeof r0->lo_sub[0]);
+ OBD_FREE_LARGE(r0->lo_sub, r0->lo_nr * sizeof r0->lo_sub[0]);
r0->lo_sub = NULL;
}
EXIT;