openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2013-07-24 10:11:47 -07:00
parent 66f42cc218
commit 0f1c743b99
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
View File

@ -455,10 +455,6 @@ int cfs_match_nid(lnet_nid_t nid, struct list_head *list);
/* logical equivalence */ /* logical equivalence */
#define equi(a, b) (!!(a) == !!(b)) #define equi(a, b) (!!(a) == !!(b))
#ifndef CFS_CURRENT_TIME
# define CFS_CURRENT_TIME time(0)
#endif
/* -------------------------------------------------------------------- /* --------------------------------------------------------------------
* Light-weight trace * Light-weight trace
* Support for temporary event tracing with minimal Heisenberg effect. * Support for temporary event tracing with minimal Heisenberg effect.

4
drivers/staging/lustre/include/linux/libcfs/linux/kp30.h
View File

@ -81,10 +81,6 @@
#define CFS_SYSFS_MODULE_PARM 1 /* module parameters accessible via sysfs */ #define CFS_SYSFS_MODULE_PARM 1 /* module parameters accessible via sysfs */
/******************************************************************************/
# define time(a) CURRENT_TIME
/******************************************************************************/ /******************************************************************************/
/* Light-weight trace /* Light-weight trace
* Support for temporary event tracing with minimal Heisenberg effect. */ * Support for temporary event tracing with minimal Heisenberg effect. */

6
drivers/staging/lustre/lustre/llite/llite_lib.c
View File

@ -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 */ /* We mark all of the fields "set" so MDS/OST does not re-set them */
if (attr->ia_valid & ATTR_CTIME) { if (attr->ia_valid & ATTR_CTIME) {
attr->ia_ctime = CFS_CURRENT_TIME; attr->ia_ctime = CURRENT_TIME;
attr->ia_valid |= ATTR_CTIME_SET; attr->ia_valid |= ATTR_CTIME_SET;
} }
if (!(attr->ia_valid & ATTR_ATIME_SET) && if (!(attr->ia_valid & ATTR_ATIME_SET) &&
(attr->ia_valid & ATTR_ATIME)) { (attr->ia_valid & ATTR_ATIME)) {
attr->ia_atime = CFS_CURRENT_TIME; attr->ia_atime = CURRENT_TIME;
attr->ia_valid |= ATTR_ATIME_SET; attr->ia_valid |= ATTR_ATIME_SET;
} }
if (!(attr->ia_valid & ATTR_MTIME_SET) && if (!(attr->ia_valid & ATTR_MTIME_SET) &&
(attr->ia_valid & ATTR_MTIME)) { (attr->ia_valid & ATTR_MTIME)) {
attr->ia_mtime = CFS_CURRENT_TIME; attr->ia_mtime = CURRENT_TIME;
attr->ia_valid |= ATTR_MTIME_SET; attr->ia_valid |= ATTR_MTIME_SET;
} }

4
drivers/staging/lustre/lustre/osc/osc_io.c
View File

@ -523,7 +523,7 @@ static int osc_io_read_start(const struct lu_env *env,
cl_object_attr_lock(obj); cl_object_attr_lock(obj);
result = cl_object_attr_get(env, obj, attr); result = cl_object_attr_get(env, obj, attr);
if (result == 0) { 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, result = cl_object_attr_set(env, obj, attr,
CAT_ATIME); 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); result = cl_object_attr_get(env, obj, attr);
if (result == 0) { if (result == 0) {
attr->cat_mtime = attr->cat_ctime = attr->cat_mtime = attr->cat_ctime =
LTIME_S(CFS_CURRENT_TIME); LTIME_S(CURRENT_TIME);
result = cl_object_attr_set(env, obj, attr, result = cl_object_attr_set(env, obj, attr,
CAT_MTIME | CAT_CTIME); CAT_MTIME | CAT_CTIME);
} }