Commit 93d3a405 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

staging/lustre: remove CFS_TIME_T definition 



The CFS_TIME_T macro serves no real purpose as we stopped using time_t
and changed over to time64_t, so we can remove the last remaining uses
of this.

Two uses of this macro are incorrect and refer to jiffies values
rather than time_t, and one refers to an inode timespec that gets
changed separately.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarOleg Drokin <green@linuxhacker.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3aabf997

drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h

+0 −1
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ static inline int cfs_time_beforeq_64(__u64 t1, __u64 t2) 
 */

#define CFS_TICK		(1)



#define CFS_TIME_T	      "%lu"

#define CFS_DURATION_T	  "%ld"



#endif /* __LIBCFS_LINUX_LINUX_TIME_H__ */

drivers/staging/lustre/lustre/mdc/mdc_reint.c

+1 −2
Original line number Diff line number Diff line
@@ -144,8 +144,7 @@ int mdc_setattr(struct obd_export *exp, struct md_op_data *op_data, 
	rpc_lock = obd->u.cli.cl_rpc_lock;



	if (op_data->op_attr.ia_valid & (ATTR_MTIME | ATTR_CTIME))

		CDEBUG(D_INODE, "setting mtime "CFS_TIME_T

		       ", ctime "CFS_TIME_T"\n",

		CDEBUG(D_INODE, "setting mtime %ld, ctime %ld\n",

		       LTIME_S(op_data->op_attr.ia_mtime),

		       LTIME_S(op_data->op_attr.ia_ctime));

	mdc_setattr_pack(req, op_data, ea, ealen, ea2, ea2len);

drivers/staging/lustre/lustre/ptlrpc/pinger.c

+2 −2
Original line number Diff line number Diff line
@@ -275,8 +275,8 @@ static int ptlrpc_pinger_main(void *arg) 
		   next ping time to next_ping + .01 sec, which means

		   we will SKIP the next ping at next_ping, and the

		   ping will get sent 2 timeouts from now!  Beware. */

		CDEBUG(D_INFO, "next wakeup in "CFS_DURATION_T" ("

		       CFS_TIME_T")\n", time_to_next_wake,

		CDEBUG(D_INFO, "next wakeup in " CFS_DURATION_T " (%ld)\n",

		       time_to_next_wake,

		       cfs_time_add(this_ping,

				    cfs_time_seconds(PING_INTERVAL)));

		if (time_to_next_wake > 0) {

drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c

+2 −3
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ int sptlrpc_proc_enc_pool_seq_show(struct seq_file *m, void *v) 
		   "cache missing:	   %lu\n"

		   "low free mark:	   %lu\n"

		   "max waitqueue depth:     %u\n"

		   "max wait time:	   " CFS_TIME_T "/%u\n",

		   "max wait time:	   %ld/%u\n",

		   totalram_pages,

		   PAGES_PER_POOL,

		   page_pools.epp_max_pages,
@@ -768,8 +768,7 @@ void sptlrpc_enc_pool_fini(void) 


	if (page_pools.epp_st_access > 0) {

		CDEBUG(D_SEC,

		       "max pages %lu, grows %u, grow fails %u, shrinks %u, access %lu, missing %lu, max qlen %u, max wait "

		       CFS_TIME_T"/%d\n",

		       "max pages %lu, grows %u, grow fails %u, shrinks %u, access %lu, missing %lu, max qlen %u, max wait %ld/%d\n",

		       page_pools.epp_st_max_pages, page_pools.epp_st_grows,

		       page_pools.epp_st_grow_fails,

		       page_pools.epp_st_shrinks, page_pools.epp_st_access,

CRA Git | Maintained and supported by SUSTech CRA and CCSE