LU-1154 clio: rename coo_attr_set to coo_attr_update

coo_attr_set() is used to update object's attribute but its name
makes confusion that people intuitively think that it is used to
pass object's attribute down to server sides.

Signed-off-by: Bobi Jam <bobijam.xu@intel.com>
Change-Id: I4fb45ff1467f37c571b3acbb9465c787d0c5f261
Reviewed-on: http://review.whamcloud.com/12888
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Jinshan Xiong <jinshan.xiong@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>

diff --git a/lustre/include/cl_object.h b/lustre/include/cl_object.h
index aadffa6..eb0fb23 100644 (file)
--- a/lustre/include/cl_object.h
+++ b/lustre/include/cl_object.h
@@ -371,8 +371,8 @@ struct cl_object_operations {
          * \return the same convention as for
          * cl_object_operations::coo_attr_get() is used.
          */
-        int (*coo_attr_set)(const struct lu_env *env, struct cl_object *obj,
-                            const struct cl_attr *attr, unsigned valid);
+       int (*coo_attr_update)(const struct lu_env *env, struct cl_object *obj,
+                              const struct cl_attr *attr, unsigned valid);
         /**
          * Update object configuration. Called top-to-bottom to modify object
          * configuration.
@@ -2259,7 +2259,7 @@ void cl_object_attr_lock  (struct cl_object *o);
 void cl_object_attr_unlock(struct cl_object *o);
 int  cl_object_attr_get   (const struct lu_env *env, struct cl_object *obj,
                            struct cl_attr *attr);
-int  cl_object_attr_set   (const struct lu_env *env, struct cl_object *obj,
+int  cl_object_attr_update(const struct lu_env *env, struct cl_object *obj,
                            const struct cl_attr *attr, unsigned valid);
 int  cl_object_glimpse    (const struct lu_env *env, struct cl_object *obj,
                            struct ost_lvb *lvb);

diff --git a/lustre/llite/vvp_io.c b/lustre/llite/vvp_io.c
index b0523fa..1e222fd 100644 (file)
--- a/lustre/llite/vvp_io.c
+++ b/lustre/llite/vvp_io.c
@@ -456,10 +456,10 @@ static int vvp_io_setattr_time(const struct lu_env *env,
                 attr->cat_mtime = io->u.ci_setattr.sa_attr.lvb_mtime;
                 valid |= CAT_MTIME;
         }
-        result = cl_object_attr_set(env, obj, attr, valid);
-        cl_object_attr_unlock(obj);
+       result = cl_object_attr_update(env, obj, attr, valid);
+       cl_object_attr_unlock(obj);
 
-        return result;
+       return result;
 }
 
 static int vvp_io_setattr_start(const struct lu_env *env,

diff --git a/lustre/llite/vvp_object.c b/lustre/llite/vvp_object.c
index 55f4e26..04c8268 100644 (file)
--- a/lustre/llite/vvp_object.c
+++ b/lustre/llite/vvp_object.c
@@ -106,8 +106,8 @@ static int vvp_attr_get(const struct lu_env *env, struct cl_object *obj,
        return 0; /* layers below have to fill in the rest */
 }
 
-static int vvp_attr_set(const struct lu_env *env, struct cl_object *obj,
-                        const struct cl_attr *attr, unsigned valid)
+static int vvp_attr_update(const struct lu_env *env, struct cl_object *obj,
+                          const struct cl_attr *attr, unsigned valid)
 {
        struct inode *inode = vvp_object_inode(obj);
 
@@ -193,14 +193,14 @@ static int vvp_object_glimpse(const struct lu_env *env,
 }
 
 static const struct cl_object_operations vvp_ops = {
-       .coo_page_init = vvp_page_init,
-       .coo_lock_init = vvp_lock_init,
-       .coo_io_init   = vvp_io_init,
-       .coo_attr_get  = vvp_attr_get,
-       .coo_attr_set  = vvp_attr_set,
-       .coo_conf_set  = vvp_conf_set,
-       .coo_prune     = vvp_prune,
-       .coo_glimpse   = vvp_object_glimpse
+       .coo_page_init    = vvp_page_init,
+       .coo_lock_init    = vvp_lock_init,
+       .coo_io_init      = vvp_io_init,
+       .coo_attr_get     = vvp_attr_get,
+       .coo_attr_update  = vvp_attr_update,
+       .coo_conf_set     = vvp_conf_set,
+       .coo_prune        = vvp_prune,
+       .coo_glimpse      = vvp_object_glimpse
 };
 
 static int vvp_object_init0(const struct lu_env *env,

diff --git a/lustre/lov/lov_object.c b/lustre/lov/lov_object.c
index 3ed4406..aff9328 100644 (file)
--- a/lustre/lov/lov_object.c
+++ b/lustre/lov/lov_object.c
@@ -922,13 +922,13 @@ static int lov_attr_get(const struct lu_env *env, struct cl_object *obj,
         return LOV_2DISPATCH_NOLOCK(cl2lov(obj), llo_getattr, env, obj, attr);
 }
 
-static int lov_attr_set(const struct lu_env *env, struct cl_object *obj,
-                        const struct cl_attr *attr, unsigned valid)
+static int lov_attr_update(const struct lu_env *env, struct cl_object *obj,
+                          const struct cl_attr *attr, unsigned valid)
 {
-        /*
-         * No dispatch is required here, as no layout implements this.
-         */
-        return 0;
+       /*
+        * No dispatch is required here, as no layout implements this.
+        */
+       return 0;
 }
 
 int lov_lock_init(const struct lu_env *env, struct cl_object *obj,
@@ -957,13 +957,13 @@ static int lov_object_getstripe(const struct lu_env *env, struct cl_object *obj,
 }
 
 static const struct cl_object_operations lov_ops = {
-        .coo_page_init = lov_page_init,
-        .coo_lock_init = lov_lock_init,
-        .coo_io_init   = lov_io_init,
-        .coo_attr_get  = lov_attr_get,
-        .coo_attr_set  = lov_attr_set,
-       .coo_conf_set  = lov_conf_set,
-       .coo_getstripe = lov_object_getstripe
+       .coo_page_init    = lov_page_init,
+       .coo_lock_init    = lov_lock_init,
+       .coo_io_init      = lov_io_init,
+       .coo_attr_get     = lov_attr_get,
+       .coo_attr_update  = lov_attr_update,
+       .coo_conf_set     = lov_conf_set,
+       .coo_getstripe    = lov_object_getstripe
 };
 
 static const struct lu_object_operations lov_lu_obj_ops = {

diff --git a/lustre/lov/lovsub_object.c b/lustre/lov/lovsub_object.c
index 54e47dd..e960cde 100644 (file)
--- a/lustre/lov/lovsub_object.c
+++ b/lustre/lov/lovsub_object.c
@@ -105,14 +105,14 @@ static int lovsub_object_print(const struct lu_env *env, void *cookie,
         return (*p)(env, cookie, "[%d]", los->lso_index);
 }
 
-static int lovsub_attr_set(const struct lu_env *env, struct cl_object *obj,
-                           const struct cl_attr *attr, unsigned valid)
+static int lovsub_attr_update(const struct lu_env *env, struct cl_object *obj,
+                             const struct cl_attr *attr, unsigned valid)
 {
-        struct lov_object *lov = cl2lovsub(obj)->lso_super;
+       struct lov_object *lov = cl2lovsub(obj)->lso_super;
 
-        ENTRY;
-        lov_r0(lov)->lo_attr_valid = 0;
-        RETURN(0);
+       ENTRY;
+       lov_r0(lov)->lo_attr_valid = 0;
+       RETURN(0);
 }
 
 static int lovsub_object_glimpse(const struct lu_env *env,
@@ -128,10 +128,10 @@ static int lovsub_object_glimpse(const struct lu_env *env,
 
 
 static const struct cl_object_operations lovsub_ops = {
-        .coo_page_init = lovsub_page_init,
-        .coo_lock_init = lovsub_lock_init,
-        .coo_attr_set  = lovsub_attr_set,
-        .coo_glimpse   = lovsub_object_glimpse
+       .coo_page_init    = lovsub_page_init,
+       .coo_lock_init    = lovsub_lock_init,
+       .coo_attr_update  = lovsub_attr_update,
+       .coo_glimpse      = lovsub_object_glimpse
 };
 
 static const struct lu_object_operations lovsub_lu_obj_ops = {

diff --git a/lustre/obdclass/cl_object.c b/lustre/obdclass/cl_object.c
index 5d77f90..e400f30 100644 (file)
--- a/lustre/obdclass/cl_object.c
+++ b/lustre/obdclass/cl_object.c
@@ -176,7 +176,7 @@ static spinlock_t *cl_object_attr_guard(struct cl_object *o)
  *
  * Prevents data-attributes from changing, until lock is released by
  * cl_object_attr_unlock(). This has to be called before calls to
- * cl_object_attr_get(), cl_object_attr_set().
+ * cl_object_attr_get(), cl_object_attr_update().
  */
 void cl_object_attr_lock(struct cl_object *o)
 __acquires(cl_object_attr_guard(o))
@@ -231,11 +231,11 @@ EXPORT_SYMBOL(cl_object_attr_get);
  * Updates data-attributes of an object \a obj.
  *
  * Only attributes, mentioned in a validness bit-mask \a v are
- * updated. Calls cl_object_operations::coo_attr_set() on every layer, bottom
+ * updated. Calls cl_object_operations::coo_upd_attr() on every layer, bottom
  * to top.
  */
-int cl_object_attr_set(const struct lu_env *env, struct cl_object *obj,
-                       const struct cl_attr *attr, unsigned v)
+int cl_object_attr_update(const struct lu_env *env, struct cl_object *obj,
+                         const struct cl_attr *attr, unsigned v)
 {
        struct lu_object_header *top;
        int result;
@@ -246,8 +246,9 @@ int cl_object_attr_set(const struct lu_env *env, struct cl_object *obj,
        top = obj->co_lu.lo_header;
        result = 0;
        list_for_each_entry_reverse(obj, &top->loh_layers, co_lu.lo_linkage) {
-               if (obj->co_ops->coo_attr_set != NULL) {
-                       result = obj->co_ops->coo_attr_set(env, obj, attr, v);
+               if (obj->co_ops->coo_attr_update != NULL) {
+                       result = obj->co_ops->coo_attr_update(env, obj, attr,
+                                                             v);
                        if (result != 0) {
                                if (result > 0)
                                        result = 0;
@@ -257,7 +258,7 @@ int cl_object_attr_set(const struct lu_env *env, struct cl_object *obj,
        }
        RETURN(result);
 }
-EXPORT_SYMBOL(cl_object_attr_set);
+EXPORT_SYMBOL(cl_object_attr_update);
 
 /**
  * Notifies layers (bottom-to-top) that glimpse AST was received.

diff --git a/lustre/osc/osc_io.c b/lustre/osc/osc_io.c
index ef94484..d4eb1e3 100644 (file)
--- a/lustre/osc/osc_io.c
+++ b/lustre/osc/osc_io.c
@@ -228,16 +228,16 @@ static void osc_page_touch_at(const struct lu_env *env,
 
        attr->cat_mtime = attr->cat_ctime = LTIME_S(CFS_CURRENT_TIME);
        valid = CAT_MTIME | CAT_CTIME;
-        if (kms > loi->loi_kms) {
-                attr->cat_kms = kms;
-                valid |= CAT_KMS;
-        }
-        if (kms > loi->loi_lvb.lvb_size) {
-                attr->cat_size = kms;
-                valid |= CAT_SIZE;
-        }
-        cl_object_attr_set(env, obj, attr, valid);
-        cl_object_attr_unlock(obj);
+       if (kms > loi->loi_kms) {
+               attr->cat_kms = kms;
+               valid |= CAT_KMS;
+       }
+       if (kms > loi->loi_lvb.lvb_size) {
+               attr->cat_size = kms;
+               valid |= CAT_SIZE;
+       }
+       cl_object_attr_update(env, obj, attr, valid);
+       cl_object_attr_unlock(obj);
 }
 
 static int osc_io_commit_async(const struct lu_env *env,
@@ -477,14 +477,15 @@ static int osc_io_setattr_start(const struct lu_env *env,
                        }
                        if (ia_valid & ATTR_CTIME_SET) {
                                attr->cat_ctime = lvb->lvb_ctime;
-                                cl_valid |= CAT_CTIME;
-                        }
-                        result = cl_object_attr_set(env, obj, attr, cl_valid);
-                }
-                cl_object_attr_unlock(obj);
-        }
-        memset(oa, 0, sizeof(*oa));
-        if (result == 0) {
+                               cl_valid |= CAT_CTIME;
+                       }
+                       result = cl_object_attr_update(env, obj, attr,
+                                                      cl_valid);
+               }
+               cl_object_attr_unlock(obj);
+       }
+       memset(oa, 0, sizeof(*oa));
+       if (result == 0) {
                oa->o_oi = loi->loi_oi;
                oa->o_mtime = attr->cat_mtime;
                oa->o_atime = attr->cat_atime;
@@ -567,7 +568,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);
-               rc = cl_object_attr_set(env, obj, attr, CAT_ATIME);
+               rc = cl_object_attr_update(env, obj, attr, CAT_ATIME);
                cl_object_attr_unlock(obj);
        }
 
@@ -585,7 +586,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);
-       rc = cl_object_attr_set(env, obj, attr, CAT_MTIME | CAT_CTIME);
+       rc = cl_object_attr_update(env, obj, attr, CAT_MTIME | CAT_CTIME);
        cl_object_attr_unlock(obj);
 
        RETURN(rc);

diff --git a/lustre/osc/osc_lock.c b/lustre/osc/osc_lock.c
index 6d15dad..6c7d8df 100644 (file)
--- a/lustre/osc/osc_lock.c
+++ b/lustre/osc/osc_lock.c
@@ -232,7 +232,7 @@ static void osc_lock_lvb_update(const struct lu_env *env,
                ldlm_lock_allow_match_locked(dlmlock);
        }
 
-       cl_object_attr_set(env, obj, attr, valid);
+       cl_object_attr_update(env, obj, attr, valid);
        cl_object_attr_unlock(obj);
 
        EXIT;
@@ -478,7 +478,7 @@ static int osc_dlm_blocking_ast0(const struct lu_env *env,
                 * Not a problem for the client */
                attr->cat_kms = ldlm_extent_shift_kms(dlmlock, old_kms);
 
-               cl_object_attr_set(env, obj, attr, CAT_KMS);
+               cl_object_attr_update(env, obj, attr, CAT_KMS);
                cl_object_attr_unlock(obj);
                unlock_res_and_lock(dlmlock);
 

diff --git a/lustre/osc/osc_object.c b/lustre/osc/osc_object.c
index b883641..728b758 100644 (file)
--- a/lustre/osc/osc_object.c
+++ b/lustre/osc/osc_object.c
@@ -170,28 +170,28 @@ static int osc_attr_get(const struct lu_env *env, struct cl_object *obj,
         return 0;
 }
 
-static int osc_attr_set(const struct lu_env *env, struct cl_object *obj,
-                       const struct cl_attr *attr, unsigned valid)
+static int osc_attr_update(const struct lu_env *env, struct cl_object *obj,
+                          const struct cl_attr *attr, unsigned valid)
 {
-        struct lov_oinfo *oinfo = cl2osc(obj)->oo_oinfo;
-        struct ost_lvb   *lvb   = &oinfo->loi_lvb;
-
-        if (valid & CAT_SIZE)
-                lvb->lvb_size = attr->cat_size;
-        if (valid & CAT_MTIME)
-                lvb->lvb_mtime = attr->cat_mtime;
-        if (valid & CAT_ATIME)
-                lvb->lvb_atime = attr->cat_atime;
-        if (valid & CAT_CTIME)
-                lvb->lvb_ctime = attr->cat_ctime;
-        if (valid & CAT_BLOCKS)
-                lvb->lvb_blocks = attr->cat_blocks;
-        if (valid & CAT_KMS) {
-                CDEBUG(D_CACHE, "set kms from "LPU64"to "LPU64"\n",
-                       oinfo->loi_kms, (__u64)attr->cat_kms);
-                loi_kms_set(oinfo, attr->cat_kms);
-        }
-        return 0;
+       struct lov_oinfo *oinfo = cl2osc(obj)->oo_oinfo;
+       struct ost_lvb   *lvb   = &oinfo->loi_lvb;
+
+       if (valid & CAT_SIZE)
+               lvb->lvb_size = attr->cat_size;
+       if (valid & CAT_MTIME)
+               lvb->lvb_mtime = attr->cat_mtime;
+       if (valid & CAT_ATIME)
+               lvb->lvb_atime = attr->cat_atime;
+       if (valid & CAT_CTIME)
+               lvb->lvb_ctime = attr->cat_ctime;
+       if (valid & CAT_BLOCKS)
+               lvb->lvb_blocks = attr->cat_blocks;
+       if (valid & CAT_KMS) {
+               CDEBUG(D_CACHE, "set kms from "LPU64"to "LPU64"\n",
+                      oinfo->loi_kms, (__u64)attr->cat_kms);
+               loi_kms_set(oinfo, attr->cat_kms);
+       }
+       return 0;
 }
 
 static int osc_object_glimpse(const struct lu_env *env,
@@ -270,13 +270,13 @@ int osc_object_is_contended(struct osc_object *obj)
 }
 
 static const struct cl_object_operations osc_ops = {
-       .coo_page_init = osc_page_init,
-       .coo_lock_init = osc_lock_init,
-       .coo_io_init   = osc_io_init,
-       .coo_attr_get  = osc_attr_get,
-       .coo_attr_set  = osc_attr_set,
-       .coo_glimpse   = osc_object_glimpse,
-       .coo_prune     = osc_object_prune
+       .coo_page_init    = osc_page_init,
+       .coo_lock_init    = osc_lock_init,
+       .coo_io_init      = osc_io_init,
+       .coo_attr_get     = osc_attr_get,
+       .coo_attr_update  = osc_attr_update,
+       .coo_glimpse      = osc_object_glimpse,
+       .coo_prune        = osc_object_prune
 };
 
 static const struct lu_object_operations osc_lu_obj_ops = {

diff --git a/lustre/osc/osc_request.c b/lustre/osc/osc_request.c
index 5bdc81e..a0d19d5 100644 (file)
--- a/lustre/osc/osc_request.c
+++ b/lustre/osc/osc_request.c
@@ -1716,7 +1716,7 @@ static int brw_interpret(const struct lu_env *env,
                }
 
                if (valid != 0)
-                       cl_object_attr_set(env, obj, attr, valid);
+                       cl_object_attr_update(env, obj, attr, valid);
                cl_object_attr_unlock(obj);
        }
        OBDO_FREE(aa->aa_oa);