cifsd: merge time_wrappers.h into smb_common.h

This patch merge time_wrappers.h into smb_common.h.

Signed-off-by: Namjae Jeon <namjae.jeon@samsung.com>
Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/cifsd/netmisc.c b/fs/cifsd/netmisc.c
index 55393667abccfad454d058f74f19ae2597f27f64..5d0327d87397eb6d3be53f3f7d0b9599de05d33c 100644 (file)
--- a/fs/cifsd/netmisc.c
+++ b/fs/cifsd/netmisc.c
@@ -10,7 +10,7 @@
 #include "glob.h"
 #include "smberr.h"
 #include "nterr.h"
-#include "time_wrappers.h"
+#include "smb_common.h"
 
 /*
  * Convert the NT UTC (based 1601-01-01, in hundred nanosecond units)
@@ -42,3 +42,18 @@ struct timespec64 ksmbd_NTtimeToUnix(__le64 ntutc)
 
        return ts;
 }
+
+/* Convert the Unix UTC into NT UTC. */
+inline u64 ksmbd_UnixTimeToNT(struct timespec64 t)
+{
+       /* Convert to 100ns intervals and then add the NTFS time offset. */
+       return (u64)t.tv_sec * 10000000 + t.tv_nsec / 100 + NTFS_TIME_OFFSET;
+}
+
+inline long long ksmbd_systime(void)
+{
+       struct timespec64       ts;
+
+       ktime_get_real_ts64(&ts);
+       return ksmbd_UnixTimeToNT(ts);
+}

diff --git a/fs/cifsd/smb2pdu.c b/fs/cifsd/smb2pdu.c
index 3e8f1a3800dd50599e3aa785bb272febe1ed91a5..139041768f65a3236737feeb3786c71dc3d669a1 100644 (file)
--- a/fs/cifsd/smb2pdu.c
+++ b/fs/cifsd/smb2pdu.c
@@ -26,7 +26,6 @@
 #include "vfs_cache.h"
 #include "misc.h"
 
-#include "time_wrappers.h"
 #include "server.h"
 #include "smb_common.h"
 #include "smbstatus.h"

diff --git a/fs/cifsd/smb_common.h b/fs/cifsd/smb_common.h
index 2d7b1c693ff4ebb1f013a8637fd25dffe7fbf044..2e171c9002b274cc76a7af246ffa795a582e8928 100644 (file)
--- a/fs/cifsd/smb_common.h
+++ b/fs/cifsd/smb_common.h
@@ -541,4 +541,10 @@ static inline void inc_rfc1001_len(void *buf, int count)
 {
        be32_add_cpu((__be32 *)buf, count);
 }
+
+#define NTFS_TIME_OFFSET       ((u64)(369 * 365 + 89) * 24 * 3600 * 10000000)
+
+struct timespec64 ksmbd_NTtimeToUnix(__le64 ntutc);
+u64 ksmbd_UnixTimeToNT(struct timespec64 t);
+long long ksmbd_systime(void);
 #endif /* __SMB_COMMON_H__ */

diff --git a/fs/cifsd/time_wrappers.h b/fs/cifsd/time_wrappers.h
deleted file mode 100644 (file)
index 31bea20..0000000
--- a/fs/cifsd/time_wrappers.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- *   Copyright (C) 2019 Samsung Electronics Co., Ltd.
- */
-
-#ifndef __KSMBD_TIME_WRAPPERS_H
-#define __KSMBD_TIME_WRAPPERS_H
-
-/*
- * A bunch of ugly hacks to workaoround all the API differences
- * between different kernel versions.
- */
-
-#define NTFS_TIME_OFFSET       ((u64)(369 * 365 + 89) * 24 * 3600 * 10000000)
-
-/* Convert the Unix UTC into NT UTC. */
-static inline u64 ksmbd_UnixTimeToNT(struct timespec64 t)
-{
-       /* Convert to 100ns intervals and then add the NTFS time offset. */
-       return (u64)t.tv_sec * 10000000 + t.tv_nsec / 100 + NTFS_TIME_OFFSET;
-}
-
-struct timespec64 ksmbd_NTtimeToUnix(__le64 ntutc);
-
-#define KSMBD_TIME_TO_TM       time64_to_tm
-
-static inline long long ksmbd_systime(void)
-{
-       struct timespec64 ts;
-
-       ktime_get_real_ts64(&ts);
-       return ksmbd_UnixTimeToNT(ts);
-}
-#endif /* __KSMBD_TIME_WRAPPERS_H */

diff --git a/fs/cifsd/vfs.c b/fs/cifsd/vfs.c
index 69dc1ee0fc7551b463b19407d0185e7417207aa2..264f8932d40f2d58ec47e9243368ab8fb3c901e3 100644 (file)
--- a/fs/cifsd/vfs.c
+++ b/fs/cifsd/vfs.c
@@ -31,7 +31,6 @@
 #include "ndr.h"
 #include "auth.h"
 
-#include "time_wrappers.h"
 #include "smb_common.h"
 #include "mgmt/share_config.h"
 #include "mgmt/tree_connect.h"