Commit 96234ec5 authored by Bobi Jam's avatar Bobi Jam Committed by Greg Kroah-Hartman
Browse files

staging: lustre: 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: default avatarBobi Jam <bobijam.xu@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-1154
Reviewed-on: http://review.whamcloud.com/12888


Reviewed-by: default avatarJinshan Xiong <jinshan.xiong@intel.com>
Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 864d6a25

drivers/staging/lustre/lustre/include/cl_object.h

+4 −4
Original line number Diff line number Diff line
@@ -369,8 +369,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 int valid);

	/**

	 * Update object configuration. Called top-to-bottom to modify object

	 * configuration.
@@ -2171,8 +2171,8 @@ 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,

			const struct cl_attr *attr, unsigned valid);

int  cl_object_attr_update(const struct lu_env *env, struct cl_object *obj,

			   const struct cl_attr *attr, unsigned int valid);

int  cl_object_glimpse(const struct lu_env *env, struct cl_object *obj,

		       struct ost_lvb *lvb);

int  cl_conf_set(const struct lu_env *env, struct cl_object *obj,

drivers/staging/lustre/lustre/llite/vvp_io.c

+1 −1
Original line number Diff line number Diff line
@@ -627,7 +627,7 @@ 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);

	result = cl_object_attr_update(env, obj, attr, valid);

	cl_object_attr_unlock(obj);



	return result;

drivers/staging/lustre/lustre/llite/vvp_object.c

+3 −3
Original line number Diff line number Diff line
@@ -101,8 +101,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 int valid)

{

	struct inode *inode = vvp_object_inode(obj);
@@ -209,7 +209,7 @@ static const struct cl_object_operations vvp_ops = { 
	.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_attr_update = vvp_attr_update,

	.coo_conf_set  = vvp_conf_set,

	.coo_prune     = vvp_prune,

	.coo_glimpse   = vvp_object_glimpse

drivers/staging/lustre/lustre/lov/lov_object.c

+3 −3
Original line number Diff line number Diff line
@@ -894,8 +894,8 @@ 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 int valid)

{

	/*

	 * No dispatch is required here, as no layout implements this.
@@ -932,7 +932,7 @@ static const struct cl_object_operations lov_ops = { 
	.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_attr_update = lov_attr_update,

	.coo_conf_set  = lov_conf_set,

	.coo_getstripe = lov_object_getstripe

};

drivers/staging/lustre/lustre/lov/lovsub_object.c

+3 −3
Original line number Diff line number Diff line
@@ -98,8 +98,8 @@ 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 int valid)

{

	struct lov_object *lov = cl2lovsub(obj)->lso_super;
@@ -119,7 +119,7 @@ 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_attr_update = lovsub_attr_update,

	.coo_glimpse   = lovsub_object_glimpse

};