LU-13004 osp: break read request into pages.

[fs/lustre-release.git] / lustre / osp / osp_md_object.c

diff --git a/lustre/osp/osp_md_object.c b/lustre/osp/osp_md_object.c
index b66509a..37ce566 100644 (file)
--- a/lustre/osp/osp_md_object.c
+++ b/lustre/osp/osp_md_object.c
@@ -178,6 +178,7 @@ int osp_md_create(const struct lu_env *env, struct dt_object *dt,
 
        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:
@@ -362,7 +363,7 @@ int osp_md_attr_set(const struct lu_env *env, struct dt_object *dt,
  *
  * \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)
@@ -382,7 +383,7 @@ static void osp_md_read_lock(const struct lu_env *env, struct dt_object *dt,
  *
  * \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)
@@ -569,15 +570,13 @@ static int osp_md_declare_index_insert(const struct lu_env *env,
  * \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,
                               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;
@@ -874,7 +873,7 @@ static int osp_md_xattr_list(const struct lu_env *env, struct dt_object *dt,
                                             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);
 
@@ -1139,14 +1138,13 @@ static ssize_t osp_md_declare_write(const struct lu_env *env,
  * \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;
@@ -1209,9 +1207,7 @@ static ssize_t osp_md_read(const struct lu_env *env, struct dt_object *dt,
        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;
 
@@ -1239,26 +1235,18 @@ static ssize_t osp_md_read(const struct lu_env *env, struct dt_object *dt,
        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;