update = thandle_to_osp_update_request(th);
LASSERT(update != NULL);
- LASSERT(attr->la_valid & LA_TYPE);
+ if (!(attr->la_valid & LA_TYPE)) {
+ CERROR("%s: create type not specified: valid %llx\n",
+ dt->do_lu.lo_dev->ld_obd->obd_name, attr->la_valid);
+ GOTO(out, rc = -EINVAL);
+ }
+
rc = OSP_UPDATE_RPC_PACK(env, out_create_pack, update,
lu_object_fid(&dt->do_lu), attr, hint, dof);
if (rc != 0)
dt->do_lu.lo_header->loh_attr |= LOHA_EXISTS | (attr->la_mode & S_IFMT);
dt2osp_obj(dt)->opo_non_exist = 0;
+ obj->opo_stale = 0;
obj->opo_attr = *attr;
out:
LASSERT(ah);
ah->dah_parent = parent;
- ah->dah_mode = child_mode;
}
/**
*
* \param[in] env execution environment
* \param[in] dt object to be locked
- * \param[in] role lock role from MDD layer, see mdd_object_role().
+ * \param[in] role lock role from MDD layer, see dt_object_role().
*/
static void osp_md_read_lock(const struct lu_env *env, struct dt_object *dt,
unsigned role)
*
* \param[in] env execution environment
* \param[in] dt object to be locked
- * \param[in] role lock role from MDD layer, see mdd_object_role().
+ * \param[in] role lock role from MDD layer, see dt_object_role().
*/
static void osp_md_write_lock(const struct lu_env *env, struct dt_object *dt,
unsigned role)
}
fid = lbuf->lb_buf;
- if (ptlrpc_rep_need_swab(req))
+ if (req_capsule_rep_need_swab(&req->rq_pill))
lustre_swab_lu_fid(fid);
if (!fid_is_sane(fid)) {
CERROR("%s: lookup "DFID" %s invalid fid "DFID"\n",
OUT_UPDATE_REPLY_SIZE);
if (reply->ourp_magic != UPDATE_REPLY_MAGIC) {
DEBUG_REQ(D_ERROR, req,
- "%s: Wrong version %x expected %x "DFID": rc = %d\n",
+ "%s: Wrong version %x expected %x "DFID": rc = %d",
dname, reply->ourp_magic, UPDATE_REPLY_MAGIC,
PFID(lu_object_fid(&dt->do_lu)), -EPROTO);
return osp_trans_update_request_create(th);
}
+static int osp_destroy_interpreter(const struct lu_env *env,
+ struct object_update_reply *reply,
+ struct ptlrpc_request *req,
+ struct osp_object *obj,
+ void *data, int index, int rc)
+{
+ return 0;
+}
+
/**
* Implement OSP layer dt_object_operations::do_destroy() interface.
*
struct osp_device *osp = lu2osp_dev(dt->do_lu.lo_dev);
struct osp_update_request *update;
int rc = 0;
-
ENTRY;
+
o->opo_non_exist = 1;
+ o->opo_destroyed = 1;
LASSERT(osp->opd_connect_mdt);
update = thandle_to_osp_update_request(th);
if (rc != 0)
RETURN(rc);
+ /* retain the object and it's status until it's destroyed on remote */
+ rc = osp_insert_update_callback(env, update, o, NULL,
+ osp_destroy_interpreter);
+ if (rc != 0)
+ RETURN(rc);
+
set_bit(LU_OBJECT_HEARD_BANSHEE, &dt->do_lu.lo_header->loh_flags);
rc = osp_insert_update_callback(env, update, dt2osp_obj(dt), NULL,
NULL);
RETURN(rc);
}
-struct dt_object_operations osp_md_obj_ops = {
+const struct dt_object_operations osp_md_obj_ops = {
.do_read_lock = osp_md_read_lock,
.do_write_lock = osp_md_write_lock,
.do_read_unlock = osp_md_read_unlock,
.do_object_lock = osp_md_object_lock,
.do_object_unlock = osp_md_object_unlock,
.do_invalidate = osp_invalidate,
+ .do_check_stale = osp_check_stale,
};
/**
struct osp_device *osp = dt2osp_dev(th->th_dev);
int rc;
+ if (dt2osp_obj(dt)->opo_destroyed)
+ return -ENOENT;
+
rc = osp_trans_update_request_create(th);
if (rc != 0)
return rc;
return 0;
}
+static int osp_write_interpreter(const struct lu_env *env,
+ struct object_update_reply *reply,
+ struct ptlrpc_request *req,
+ struct osp_object *obj,
+ void *data, int index, int rc)
+{
+ if (rc) {
+ CDEBUG(D_HA, "error "DFID": rc = %d\n",
+ PFID(lu_object_fid(&obj->opo_obj.do_lu)), rc);
+ OBD_RACE(OBD_FAIL_OUT_OBJECT_MISS);
+ spin_lock(&obj->opo_lock);
+ obj->opo_attr.la_valid = 0;
+ obj->opo_stale = 1;
+ spin_unlock(&obj->opo_lock);
+ }
+ return 0;
+}
+
/**
* Implementation of dt_body_operations::dbo_write
*
ssize_t rc;
ENTRY;
+ if (obj->opo_destroyed)
+ RETURN(-ENOENT);
+
update = thandle_to_osp_update_request(th);
LASSERT(update != NULL);
if (rc < 0)
RETURN(rc);
+ /* to be able to invalidate object's state in case of an error */
+ rc = osp_insert_update_callback(env, update, obj, NULL,
+ osp_write_interpreter);
+ if (rc < 0)
+ RETURN(rc);
+
/* XXX: how about the write error happened later? */
*pos += buf->lb_len;
struct out_read_reply *orr;
struct ptlrpc_bulk_desc *desc;
struct object_update_reply *reply;
- __u32 left_size;
- int nbufs;
- int i;
+ int pages;
int rc;
ENTRY;
+ if (dt2osp_obj(dt)->opo_destroyed)
+ RETURN(-ENOENT);
+
/* Because it needs send the update buffer right away,
* just create an update buffer, instead of attaching the
* update_remote list of the thandle. */
if (rc != 0)
GOTO(out_update, rc);
- nbufs = (rbuf->lb_len + OUT_BULK_BUFFER_SIZE - 1) /
- OUT_BULK_BUFFER_SIZE;
+ /* First *and* last might be partial pages, hence +1 */
+ pages = DIV_ROUND_UP(rbuf->lb_len, PAGE_SIZE) + 1;
+
/* allocate bulk descriptor */
- desc = ptlrpc_prep_bulk_imp(req, nbufs, 1,
- PTLRPC_BULK_PUT_SINK | PTLRPC_BULK_BUF_KVEC,
- MDS_BULK_PORTAL, &ptlrpc_bulk_kvec_ops);
+ desc = ptlrpc_prep_bulk_imp(req, pages, 1,
+ PTLRPC_BULK_PUT_SINK,
+ MDS_BULK_PORTAL,
+ &ptlrpc_bulk_kiov_nopin_ops);
if (desc == NULL)
GOTO(out, rc = -ENOMEM);
- /* split the buffer into small chunk size */
- left_size = rbuf->lb_len;
- for (i = 0; i < nbufs; i++) {
- int read_size;
-
- read_size = left_size > OUT_BULK_BUFFER_SIZE ?
- OUT_BULK_BUFFER_SIZE : left_size;
- desc->bd_frag_ops->add_iov_frag(desc, ptr, read_size);
-
- ptr += read_size;
- }
+ desc->bd_frag_ops->add_iov_frag(desc, ptr, rbuf->lb_len);
osp_set_req_replay(osp, req);
req->rq_bulk_read = 1;
}
/* These body operation will be used to write symlinks during migration etc */
-struct dt_body_operations osp_md_body_ops = {
+const struct dt_body_operations osp_md_body_ops = {
.dbo_declare_write = osp_md_declare_write,
.dbo_write = osp_md_write,
.dbo_read = osp_md_read,
git://git.whamcloud.com / fs / lustre-release.git / blobdiff