LU-6245 libcfs: Remove kp30.h

[fs/lustre-release.git] / lustre / osc / osc_io.c

diff --git a/lustre/osc/osc_io.c b/lustre/osc/osc_io.c
index 69d4e06..0a2a3dd 100644 (file)
--- a/lustre/osc/osc_io.c
+++ b/lustre/osc/osc_io.c
@@ -95,6 +95,7 @@ static int osc_io_read_ahead(const struct lu_env *env,
 
        dlmlock = osc_dlmlock_at_pgoff(env, osc, start, 0);
        if (dlmlock != NULL) {
+               LASSERT(dlmlock->l_ast_data == osc);
                if (dlmlock->l_req_mode != LCK_PR) {
                        struct lustre_handle lockh;
                        ldlm_lock2handle(dlmlock, &lockh);
@@ -246,7 +247,7 @@ static void osc_page_touch_at(const struct lu_env *env,
                kms > loi->loi_kms ? "" : "not ", loi->loi_kms, kms,
                loi->loi_lvb.lvb_size);
 
-       attr->cat_mtime = attr->cat_ctime = LTIME_S(CFS_CURRENT_TIME);
+       attr->cat_mtime = attr->cat_ctime = LTIME_S(CURRENT_TIME);
        valid = CAT_MTIME | CAT_CTIME;
        if (kms > loi->loi_kms) {
                attr->cat_kms = kms;
@@ -724,7 +725,7 @@ static int osc_io_read_start(const struct lu_env *env,
 
        if (!slice->cis_io->ci_noatime) {
                cl_object_attr_lock(obj);
-               attr->cat_atime = LTIME_S(CFS_CURRENT_TIME);
+               attr->cat_atime = LTIME_S(CURRENT_TIME);
                rc = cl_object_attr_update(env, obj, attr, CAT_ATIME);
                cl_object_attr_unlock(obj);
        }
@@ -742,7 +743,7 @@ static int osc_io_write_start(const struct lu_env *env,
 
        OBD_FAIL_TIMEOUT(OBD_FAIL_OSC_DELAY_SETTIME, 1);
        cl_object_attr_lock(obj);
-       attr->cat_mtime = attr->cat_ctime = LTIME_S(CFS_CURRENT_TIME);
+       attr->cat_mtime = attr->cat_ctime = LTIME_S(CURRENT_TIME);
        rc = cl_object_attr_update(env, obj, attr, CAT_MTIME | CAT_CTIME);
        cl_object_attr_unlock(obj);
 
@@ -838,6 +839,76 @@ static void osc_io_fsync_end(const struct lu_env *env,
        slice->cis_io->ci_result = result;
 }
 
+static int osc_io_ladvise_start(const struct lu_env *env,
+                               const struct cl_io_slice *slice)
+{
+       int                      result = 0;
+       struct cl_io            *io = slice->cis_io;
+       struct osc_io           *oio = cl2osc_io(env, slice);
+       struct cl_object        *obj = slice->cis_obj;
+       struct lov_oinfo        *loi = cl2osc(obj)->oo_oinfo;
+       struct cl_ladvise_io    *lio = &io->u.ci_ladvise;
+       struct obdo             *oa = &oio->oi_oa;
+       struct osc_async_cbargs *cbargs = &oio->oi_cbarg;
+       struct lu_ladvise       *ladvise;
+       struct ladvise_hdr      *ladvise_hdr;
+       int                      buf_size;
+       int                      num_advise = 1;
+       ENTRY;
+
+       /* TODO: add multiple ladvise support in CLIO */
+       buf_size = offsetof(typeof(*ladvise_hdr), lah_advise[num_advise]);
+       if (osc_env_info(env)->oti_ladvise_buf.lb_len < buf_size)
+               lu_buf_realloc(&osc_env_info(env)->oti_ladvise_buf, buf_size);
+
+       ladvise_hdr = osc_env_info(env)->oti_ladvise_buf.lb_buf;
+       if (ladvise_hdr == NULL)
+               RETURN(-ENOMEM);
+
+       memset(ladvise_hdr, 0, buf_size);
+       ladvise_hdr->lah_magic = LADVISE_MAGIC;
+       ladvise_hdr->lah_count = num_advise;
+       ladvise_hdr->lah_flags = lio->li_flags;
+
+       memset(oa, 0, sizeof(*oa));
+       oa->o_oi = loi->loi_oi;
+       oa->o_valid = OBD_MD_FLID;
+       obdo_set_parent_fid(oa, lio->li_fid);
+
+       ladvise = ladvise_hdr->lah_advise;
+       ladvise->lla_start = lio->li_start;
+       ladvise->lla_end = lio->li_end;
+       ladvise->lla_advice = lio->li_advice;
+
+       if (lio->li_flags & LF_ASYNC) {
+               result = osc_ladvise_base(osc_export(cl2osc(obj)), oa,
+                                         ladvise_hdr, NULL, NULL, NULL);
+       } else {
+               init_completion(&cbargs->opc_sync);
+               result = osc_ladvise_base(osc_export(cl2osc(obj)), oa,
+                                         ladvise_hdr, osc_async_upcall,
+                                         cbargs, PTLRPCD_SET);
+               cbargs->opc_rpc_sent = result == 0;
+       }
+       RETURN(result);
+}
+
+static void osc_io_ladvise_end(const struct lu_env *env,
+                              const struct cl_io_slice *slice)
+{
+       struct cl_io            *io = slice->cis_io;
+       struct osc_io           *oio = cl2osc_io(env, slice);
+       struct osc_async_cbargs *cbargs = &oio->oi_cbarg;
+       int                      result = 0;
+       struct cl_ladvise_io    *lio = &io->u.ci_ladvise;
+
+       if ((!(lio->li_flags & LF_ASYNC)) && cbargs->opc_rpc_sent) {
+               wait_for_completion(&cbargs->opc_sync);
+               result = cbargs->opc_rc;
+       }
+       slice->cis_io->ci_result = result;
+}
+
 static void osc_io_end(const struct lu_env *env,
                       const struct cl_io_slice *slice)
 {
@@ -886,6 +957,11 @@ static const struct cl_io_operations osc_io_ops = {
                        .cio_end    = osc_io_fsync_end,
                        .cio_fini   = osc_io_fini
                },
+               [CIT_LADVISE] = {
+                       .cio_start  = osc_io_ladvise_start,
+                       .cio_end    = osc_io_ladvise_end,
+                       .cio_fini   = osc_io_fini
+               },
                [CIT_MISC] = {
                        .cio_fini   = osc_io_fini
                }