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: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h b/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h
index 09c59f080ca3cab674658f2f53ffd31efbcbbefb..ed8764b11c8077c580b60c6965f711071c09c0f1 100644 (file)
--- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h
+++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h
@@ -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__ */

diff --git a/drivers/staging/lustre/lustre/mdc/mdc_reint.c b/drivers/staging/lustre/lustre/mdc/mdc_reint.c
index 47051c0799f8e3e666ab3a2bd06888e1765e8c60..79e4fd48a96ad855cb58d00a5ad8c0cb779eb872 100644 (file)
--- a/drivers/staging/lustre/lustre/mdc/mdc_reint.c
+++ b/drivers/staging/lustre/lustre/mdc/mdc_reint.c
@@ -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);

diff --git a/drivers/staging/lustre/lustre/ptlrpc/pinger.c b/drivers/staging/lustre/lustre/ptlrpc/pinger.c
index 16dfa8e1ed3fb952747575b5573fa5a8738108d7..47061740f0bfeb934ede87ff075d4d3342a5b30a 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/pinger.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/pinger.c
@@ -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) {

diff --git a/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c b/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c
index 56dab9db4157264da606d9c1bb5adc5798f0d43f..c18b71c71181fc7675a965ce495809873c6567a6 100644 (file)
--- a/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c
+++ b/drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c
@@ -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,