struct lu_attr *attr, struct dt_allocation_hint *hint,
struct dt_object_format *dof, struct thandle *th)
{
- struct osp_update_request *update;
- struct osp_object *obj = dt2osp_obj(dt);
- int rc;
+ struct osp_update_request *update;
+ struct osp_object *obj = dt2osp_obj(dt);
+ int rc;
update = thandle_to_osp_update_request(th);
LASSERT(update != NULL);
LASSERT(attr->la_valid & LA_TYPE);
- rc = osp_update_rpc_pack(env, create, update, OUT_CREATE,
+ rc = OSP_UPDATE_RPC_PACK(env, out_create_pack, update,
lu_object_fid(&dt->do_lu), attr, hint, dof);
if (rc != 0)
GOTO(out, rc);
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:
static int osp_md_ref_del(const struct lu_env *env, struct dt_object *dt,
struct thandle *th)
{
- struct osp_update_request *update;
- int rc;
+ struct osp_update_request *update;
+ int rc;
update = thandle_to_osp_update_request(th);
LASSERT(update != NULL);
- rc = osp_update_rpc_pack(env, ref_del, update, OUT_REF_DEL,
+ rc = OSP_UPDATE_RPC_PACK(env, out_ref_del_pack, update,
lu_object_fid(&dt->do_lu));
return rc;
}
static int osp_md_ref_add(const struct lu_env *env, struct dt_object *dt,
struct thandle *th)
{
- struct osp_update_request *update;
- int rc;
+ struct osp_update_request *update;
+ int rc;
update = thandle_to_osp_update_request(th);
LASSERT(update != NULL);
- rc = osp_update_rpc_pack(env, ref_add, update, OUT_REF_ADD,
+ rc = OSP_UPDATE_RPC_PACK(env, out_ref_add_pack, update,
lu_object_fid(&dt->do_lu));
return rc;
}
int osp_md_attr_set(const struct lu_env *env, struct dt_object *dt,
const struct lu_attr *attr, struct thandle *th)
{
- struct osp_update_request *update;
- int rc;
+ struct osp_update_request *update;
+ int rc;
update = thandle_to_osp_update_request(th);
LASSERT(update != NULL);
- rc = osp_update_rpc_pack(env, attr_set, update, OUT_ATTR_SET,
+ rc = OSP_UPDATE_RPC_PACK(env, out_attr_set_pack, update,
lu_object_fid(&dt->do_lu), attr);
return rc;
}
*
* \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)
if (IS_ERR(update))
RETURN(PTR_ERR(update));
- rc = osp_update_rpc_pack(env, index_lookup, update, OUT_INDEX_LOOKUP,
+ rc = OSP_UPDATE_RPC_PACK(env, out_index_lookup_pack, update,
lu_object_fid(&dt->do_lu), rec, key);
if (rc != 0) {
CERROR("%s: Insert update error: rc = %d\n",
* \param[in] rec record of the index to be inserted
* \param[in] key key of the index to be inserted
* \param[in] th the transaction handle
- * \param[in] ignore_quota quota enforcement for insert
*
* \retval 0 if packing index insert succeeds.
* \retval negative errno if packing fails.
*/
-static int osp_md_index_insert(const struct lu_env *env,
- struct dt_object *dt,
+static int osp_md_index_insert(const struct lu_env *env, struct dt_object *dt,
const struct dt_rec *rec,
- const struct dt_key *key,
- struct thandle *th,
- int ignore_quota)
+ const struct dt_key *key, struct thandle *th)
{
struct osp_update_request *update;
- int rc;
+ int rc;
update = thandle_to_osp_update_request(th);
LASSERT(update != NULL);
- rc = osp_update_rpc_pack(env, index_insert, update, OUT_INDEX_INSERT,
+ rc = OSP_UPDATE_RPC_PACK(env, out_index_insert_pack, update,
lu_object_fid(&dt->do_lu), rec, key);
return rc;
}
update = thandle_to_osp_update_request(th);
LASSERT(update != NULL);
- rc = osp_update_rpc_pack(env, index_delete, update, OUT_INDEX_DELETE,
+ rc = OSP_UPDATE_RPC_PACK(env, out_index_delete_pack, update,
lu_object_fid(&dt->do_lu), key);
return rc;
if (IS_ERR(update))
RETURN(PTR_ERR(update));
- rc = osp_update_rpc_pack(env, xattr_list, update, OUT_XATTR_LIST,
+ rc = OSP_UPDATE_RPC_PACK(env, out_xattr_list_pack, update,
lu_object_fid(&dt->do_lu), buf->lb_len);
if (rc) {
CERROR("%s: Insert update error "DFID": rc = %d\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);
int osp_md_destroy(const struct lu_env *env, struct dt_object *dt,
struct thandle *th)
{
- struct osp_object *o = dt2osp_obj(dt);
- struct osp_device *osp = lu2osp_dev(dt->do_lu.lo_dev);
- struct osp_update_request *update;
- int rc = 0;
+ struct osp_object *o = dt2osp_obj(dt);
+ 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;
update = thandle_to_osp_update_request(th);
LASSERT(update != NULL);
- rc = osp_update_rpc_pack(env, destroy, update, OUT_DESTROY,
+ rc = OSP_UPDATE_RPC_PACK(env, out_destroy_pack, update,
lu_object_fid(&dt->do_lu));
if (rc != 0)
RETURN(rc);
* \param[in] buf buffer to write which includes an embedded size field
* \param[in] pos offet in the object to start writing at
* \param[in] th transaction handle
- * \param[in] ignore_quota quota enforcement for this write
*
* \retval the buffer size in bytes if packing succeeds.
* \retval negative errno if packing fails.
*/
static ssize_t osp_md_write(const struct lu_env *env, struct dt_object *dt,
const struct lu_buf *buf, loff_t *pos,
- struct thandle *th, int ignore_quota)
+ struct thandle *th)
{
struct osp_object *obj = dt2osp_obj(dt);
struct osp_update_request *update;
CDEBUG(D_INFO, "write "DFID" offset = %llu length = %zu\n",
PFID(lu_object_fid(&dt->do_lu)), *pos, buf->lb_len);
- rc = osp_update_rpc_pack(env, write, update, OUT_WRITE,
+ rc = OSP_UPDATE_RPC_PACK(env, out_write_pack, update,
lu_object_fid(&dt->do_lu), buf, *pos);
if (rc < 0)
RETURN(rc);
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 (IS_ERR(update))
RETURN(PTR_ERR(update));
- rc = osp_update_rpc_pack(env, read, update, OUT_READ,
+ rc = OSP_UPDATE_RPC_PACK(env, out_read_pack, update,
lu_object_fid(&dt->do_lu),
rbuf->lb_len, *pos);
if (rc != 0) {
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 | PTLRPC_BULK_BUF_KIOV,
+ 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;