Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f1c743b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

staging: lustre: don't use time() or CFS_CURRENT_TIME 



It's just "CURRENT_TIME", don't redefine a macro for something so simple
as that...

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 66f42cc2

drivers/staging/lustre/include/linux/libcfs/libcfs_private.h

+0 −4
Original line number Diff line number Diff line
@@ -455,10 +455,6 @@ int cfs_match_nid(lnet_nid_t nid, struct list_head *list); 
/* logical equivalence */

#define equi(a, b) (!!(a) == !!(b))



#ifndef CFS_CURRENT_TIME

# define CFS_CURRENT_TIME time(0)

#endif



/* --------------------------------------------------------------------

 * Light-weight trace

 * Support for temporary event tracing with minimal Heisenberg effect.

drivers/staging/lustre/include/linux/libcfs/linux/kp30.h

+0 −4
Original line number Diff line number Diff line
@@ -81,10 +81,6 @@ 


#define CFS_SYSFS_MODULE_PARM  1 /* module parameters accessible via sysfs */



/******************************************************************************/



# define time(a) CURRENT_TIME



/******************************************************************************/

/* Light-weight trace

 * Support for temporary event tracing with minimal Heisenberg effect. */

drivers/staging/lustre/lustre/llite/llite_lib.c

+3 −3
Original line number Diff line number Diff line
@@ -1408,17 +1408,17 @@ int ll_setattr_raw(struct dentry *dentry, struct iattr *attr) 


	/* We mark all of the fields "set" so MDS/OST does not re-set them */

	if (attr->ia_valid & ATTR_CTIME) {

		attr->ia_ctime = CFS_CURRENT_TIME;

		attr->ia_ctime = CURRENT_TIME;

		attr->ia_valid |= ATTR_CTIME_SET;

	}

	if (!(attr->ia_valid & ATTR_ATIME_SET) &&

	    (attr->ia_valid & ATTR_ATIME)) {

		attr->ia_atime = CFS_CURRENT_TIME;

		attr->ia_atime = CURRENT_TIME;

		attr->ia_valid |= ATTR_ATIME_SET;

	}

	if (!(attr->ia_valid & ATTR_MTIME_SET) &&

	    (attr->ia_valid & ATTR_MTIME)) {

		attr->ia_mtime = CFS_CURRENT_TIME;

		attr->ia_mtime = CURRENT_TIME;

		attr->ia_valid |= ATTR_MTIME_SET;

	}

drivers/staging/lustre/lustre/osc/osc_io.c

+2 −2
Original line number Diff line number Diff line
@@ -523,7 +523,7 @@ static int osc_io_read_start(const struct lu_env *env, 
		cl_object_attr_lock(obj);

		result = cl_object_attr_get(env, obj, attr);

		if (result == 0) {

			attr->cat_atime = LTIME_S(CFS_CURRENT_TIME);

			attr->cat_atime = LTIME_S(CURRENT_TIME);

			result = cl_object_attr_set(env, obj, attr,

						    CAT_ATIME);

		}
@@ -547,7 +547,7 @@ static int osc_io_write_start(const struct lu_env *env, 
		result = cl_object_attr_get(env, obj, attr);

		if (result == 0) {

			attr->cat_mtime = attr->cat_ctime =

				LTIME_S(CFS_CURRENT_TIME);

				LTIME_S(CURRENT_TIME);

			result = cl_object_attr_set(env, obj, attr,

						    CAT_MTIME | CAT_CTIME);

		}