From patchwork Mon Jun 20 00:27:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepa Dinamani X-Patchwork-Id: 9186327 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 10C6260871 for ; Mon, 20 Jun 2016 00:31:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0C5B82236A for ; Mon, 20 Jun 2016 00:31:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 00DED22380; Mon, 20 Jun 2016 00:31:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 40B302236A for ; Mon, 20 Jun 2016 00:31:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751653AbcFTAa1 (ORCPT ); Sun, 19 Jun 2016 20:30:27 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:34993 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752008AbcFTA2Y (ORCPT ); Sun, 19 Jun 2016 20:28:24 -0400 Received: by mail-pf0-f195.google.com with SMTP id t190so10226528pfb.2; Sun, 19 Jun 2016 17:28:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=C0s4CeFK/yfsvjIlcEaRecx8UqOZgzYGsThi8H3Q+ZE=; b=lMvOwNhUyszqhnNRbYGXtxXMd290tgkwKPnVfhmd8/vPwL3eiXURVQcWuROwzABKAK DT9/ODjPVjMN5NUn5b6q+KmNoB1XmYxk6251rLsIMZJVgvi3AvGSPX7EbxrzAbL4l1ix MZMJtT2GTQWPlzn1K8Iem1NZ5CziHDG4H/Xg2oMmayjX9OplGIKS3LX1uCB0V+QuDUgI cB6p3+RbETjp1eOUEXcRBJmhCKB7UQqbu8K65UXl+DOCzCjaMJho+6h+DNJF0BLNLwPy uAFESwxNEFmkp/BkWKucJp6XRzaKeWj+j4toxkNELm8QMtDP1R8mXQGUFG8lCOsGx172 +uTQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=C0s4CeFK/yfsvjIlcEaRecx8UqOZgzYGsThi8H3Q+ZE=; b=W2McYsTnTAKoJIzAIBS6M+6f/cvLHWRf2NL0ppJVvTqPHaxtV7NghezokK/zm6jVqQ vZC7a6yVlCJr/uksj6AIXC5DPP8Uxgx+yA7hbP2Gr8+NRduEIJDsl8EpM11MeCh1TFZd ehe/SBurUYWqHR/VbOCk6Mphpzpk08ZDAltNfFxhShZcHIKyOsO8AcLd3ZwTte+FdWQE oRyP9kFGeQR1FV6GXTr7L7EST5gShpG3Nonqt1CjzZnZOGeNIkSDKrn7VOBfEgvmAnGW jIOuY6XFC1ypIx/ORJUX4d2frOjwC0qf2o8vi4gaAVT0gaGBwJZ/YA2ITiL1VQTB9eoL 89JA== X-Gm-Message-State: ALyK8tKZ8OhegpK2xm0Y4xXyNo8W0hPNZukL46YcKqPNm8FBuQo6dRDIAyD1C4U4of8J0g== X-Received: by 10.98.79.194 with SMTP id f63mr18330808pfj.95.1466382502899; Sun, 19 Jun 2016 17:28:22 -0700 (PDT) Received: from deepa-ubuntu.hsd1.ca.comcast.net (c-73-252-251-201.hsd1.ca.comcast.net. [73.252.251.201]) by smtp.gmail.com with ESMTPSA id s12sm34984980pfj.57.2016.06.19.17.28.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 19 Jun 2016 17:28:22 -0700 (PDT) From: Deepa Dinamani 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 Subject: [PATCH v2 11/24] fs: cifs: Replace CURRENT_TIME with ktime_get_real_ts() Date: Sun, 19 Jun 2016 17:27:10 -0700 Message-Id: <1466382443-11063-12-git-send-email-deepa.kernel@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1466382443-11063-1-git-send-email-deepa.kernel@gmail.com> References: <1466382443-11063-1-git-send-email-deepa.kernel@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Cc: Steve French --- 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,