From: Deepa Dinamani <deepa.kernel@gmail.com>
To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: arnd@arndb.de, tglx@linutronix.de, torvalds@linux-foundation.org,
tytso@mit.edu, viro@zeniv.linux.org.uk, y2038@lists.linaro.org,
Steve French <sfrench@samba.org>
Subject: [PATCH v3 12/24] fs: cifs: Replace CURRENT_TIME with ktime_get_real_ts()
Date: Sat, 25 Jun 2016 14:37:36 -0700 [thread overview]
Message-ID: <1466890668-23400-13-git-send-email-deepa.kernel@gmail.com> (raw)
In-Reply-To: <1466890668-23400-1-git-send-email-deepa.kernel@gmail.com>
This is in preparation for the patch that transitions
vfs timestamps to use 64 bit time and hence make them
y2038 safe.
CURRENT_TIME macro will be deleted before merging the
aforementioned patch.
Filesystem times will use current_fs_time() instead of
CURRENT_TIME.
Use ktime_get_real_ts() here as this is not filesystem time.
ktime_get_real_ts() returns the timestamp in ns which can
be used to calculate network time for NTLMv2 authentication
timestamp.
All cifs timestamps currently use timespec internally.
This timestamp can also be transitioned into using
timespec64 when all other timestamps for cifs is transitioned
to use timespec64.
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Cc: Steve French <sfrench@samba.org>
---
fs/cifs/cifsencrypt.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/fs/cifs/cifsencrypt.c b/fs/cifs/cifsencrypt.c
index 6aeb8d4..b86ce67 100644
--- a/fs/cifs/cifsencrypt.c
+++ b/fs/cifs/cifsencrypt.c
@@ -471,6 +471,7 @@ find_timestamp(struct cifs_ses *ses)
unsigned char *blobptr;
unsigned char *blobend;
struct ntlmssp2_name *attrptr;
+ struct timespec ts;
if (!ses->auth_key.len || !ses->auth_key.response)
return 0;
@@ -495,7 +496,8 @@ find_timestamp(struct cifs_ses *ses)
blobptr += attrsize; /* advance attr value */
}
- return cpu_to_le64(cifs_UnixTimeToNT(CURRENT_TIME));
+ ktime_get_real_ts(&ts);
+ return cpu_to_le64(cifs_UnixTimeToNT(ts));
}
static int calc_ntlmv2_hash(struct cifs_ses *ses, char *ntlmv2_hash,
--
1.9.1
next prev parent reply other threads:[~2016-06-25 21:38 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-25 21:37 [PATCH v3 00/24] Delete CURRENT_TIME_SEC and replace current_fs_time() Deepa Dinamani
2016-06-25 21:37 ` [PATCH v3 01/24] vfs: Add current_time() api Deepa Dinamani
2016-06-25 21:37 ` [PATCH v3 02/24] fs: proc: Delete inode time initializations in proc_alloc_inode() Deepa Dinamani
2016-06-25 21:37 ` [PATCH v3 03/24] fs: Replace CURRENT_TIME with current_time() for inode timestamps Deepa Dinamani
2016-06-25 21:37 ` [PATCH v3 04/24] fs: Replace CURRENT_TIME_SEC " Deepa Dinamani
2016-06-25 21:37 ` [PATCH v3 05/24] fs: Replace current_fs_time() with current_time() Deepa Dinamani
2016-06-25 21:37 ` [PATCH v3 06/24] fs: jfs: Replace CURRENT_TIME_SEC by current_time() Deepa Dinamani
2016-06-25 21:37 ` [PATCH v3 07/24] fs: ext4: Use current_time() for inode timestamps Deepa Dinamani
2016-06-25 21:37 ` [PATCH v3 08/24] fs: ubifs: Replace CURRENT_TIME_SEC with current_time Deepa Dinamani
2016-06-25 21:37 ` [PATCH v3 09/24] fs: btrfs: Use ktime_get_real_ts for root ctime Deepa Dinamani
2016-06-25 21:37 ` [PATCH v3 10/24] fs: udf: Replace CURRENT_TIME with current_time() Deepa Dinamani
2016-06-25 21:37 ` [PATCH v3 11/24] fs: cifs: Replace CURRENT_TIME by current_time() Deepa Dinamani
2016-06-25 21:37 ` Deepa Dinamani [this message]
2016-06-25 21:37 ` [PATCH v3 13/24] fs: cifs: Replace CURRENT_TIME by get_seconds Deepa Dinamani
2016-06-25 21:37 ` [PATCH v3 14/24] fs: f2fs: Use ktime_get_real_seconds for sit_info times Deepa Dinamani
2016-06-25 21:37 ` [PATCH v3 15/24] drivers: staging: lustre: Replace CURRENT_TIME with current_time() Deepa Dinamani
2016-06-25 21:45 ` Greg Kroah-Hartman
2016-06-25 21:37 ` [PATCH v3 16/24] fs: ocfs2: Use time64_t to represent orphan scan times Deepa Dinamani
2016-06-25 21:37 ` [PATCH v3 17/24] fs: ocfs2: Replace CURRENT_TIME with ktime_get_real_seconds() Deepa Dinamani
2016-06-25 21:37 ` [PATCH v3 18/24] audit: Use timespec64 to represent audit timestamps Deepa Dinamani
2016-06-25 21:37 ` [PATCH v3 19/24] fs: nfs: Make nfs boot time y2038 safe Deepa Dinamani
2016-06-25 21:37 ` [PATCH v3 20/24] block: Replace CURRENT_TIME with ktime_get_real_ts Deepa Dinamani
2016-06-25 21:37 ` [PATCH v3 21/24] libceph: " Deepa Dinamani
2016-06-25 21:37 ` [PATCH v3 22/24] fs: ceph: Replace current_fs_time for request stamp Deepa Dinamani
2016-06-25 21:37 ` [PATCH v3 23/24] time: Delete current_fs_time() function Deepa Dinamani
2016-06-25 21:37 ` [PATCH v3 24/24] time: Delete CURRENT_TIME_SEC Deepa Dinamani
2016-06-29 19:48 ` [Y2038] [PATCH v3 00/24] Delete CURRENT_TIME_SEC and replace current_fs_time() Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1466890668-23400-13-git-send-email-deepa.kernel@gmail.com \
--to=deepa.kernel@gmail.com \
--cc=arnd@arndb.de \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sfrench@samba.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
--cc=y2038@lists.linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).