From patchwork Sat Jun 25 21:37:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepa Dinamani X-Patchwork-Id: 9198799 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 F25DE6075F for ; Sat, 25 Jun 2016 21:44:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E8BE728527 for ; Sat, 25 Jun 2016 21:44:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DDA862852B; Sat, 25 Jun 2016 21:44:05 +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=unavailable 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 4DDDB28527 for ; Sat, 25 Jun 2016 21:44:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751842AbcFYVnV (ORCPT ); Sat, 25 Jun 2016 17:43:21 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:35387 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751879AbcFYVif (ORCPT ); Sat, 25 Jun 2016 17:38:35 -0400 Received: by mail-pf0-f194.google.com with SMTP id t190so12308894pfb.2; Sat, 25 Jun 2016 14:38:34 -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=7TiMnFTObx+lCfh3rHFXu6DPdu7y7IT/Pl9QPbacNYk=; b=0uUr9YKXICEF4IqAC8D2Nn4Y0IyGQEPkAsTj54gyEwUJNcABVkhgkpg+MsJGg522m2 cYz0OLOkHso2xnsKjpnlEql8caclzGIn+4EUN2kKrzVPv92CQE/N1PGfw1+5I6830Yeu n7BOa0/d62v1F0R8H2Mm+tiKhD5ho8nlr88VyLJqdA+zQLA+HWW84hPyyL86jXbbnTUv VvdUKBlhuQgTOjY09nEq470IUCSHzW0AKHL1AL7rlOXjnHE6O+roaYcOt1vbTQDkTlvk TeQrxHXg785IbEFRgBQHwOxgp32dSgMn6mRKoR7wJQQCqaHfNZhnud75THRmbntZ+Jbe shIg== 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=7TiMnFTObx+lCfh3rHFXu6DPdu7y7IT/Pl9QPbacNYk=; b=CHe0c7gzsIbqzIFyaXji7UIo+FOeXFQZuWwsyMXzmggkp43ggbyke8njUTckVIRG3w RWCT55eLA/75mwCUdjoIpPG6kDP053ZFmiV9W7oGIPmHmxIXzHGNBBsKpBnaA12TjNWp SAyjy74DY6Vi7e3AbNzq7ucLieaVDDBcZ6hS99UtIFv+TklgKvaS6XbrObb7XD3m1XrR bNXno8SXFkLT+l9mKfEXQSIKqrRcrTIBsuYKxfBxIHQH0JJTxDu+ChqRHzLEcubl8E9G 92WuweO6Gr2yszML3aM8wRPxBRTktGBQR6F/q3mnSD2XY5bNM7wKygAQgk7PSglEYZQu qOlQ== X-Gm-Message-State: ALyK8tJ1+fqNnZvYPcwPrOJCroLEEwbzB9wFy59AOrgqr6rHsfompxtWA2zbXSONnZBWTQ== X-Received: by 10.98.54.198 with SMTP id d189mr19786964pfa.39.1466890714134; Sat, 25 Jun 2016 14:38:34 -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 m8sm1861308pfi.27.2016.06.25.14.38.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 25 Jun 2016 14:38:33 -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 v3 11/24] fs: cifs: Replace CURRENT_TIME by current_time() Date: Sat, 25 Jun 2016 14:37:35 -0700 Message-Id: <1466890668-23400-12-git-send-email-deepa.kernel@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1466890668-23400-1-git-send-email-deepa.kernel@gmail.com> References: <1466890668-23400-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 CURRENT_TIME macro is not appropriate for filesystems as it doesn't use the right granularity for filesystem timestamps. Use current_time() instead. This is also 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 change. Change signature of helper cifs_all_info_to_fattr since it now needs both super_block and cifs_sb_info. Note: The inode timestamps read from the server are assumed to have correct granularity and range. Signed-off-by: Deepa Dinamani Cc: Steve French --- fs/cifs/inode.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index 9b3d92e..721809e 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c @@ -320,9 +320,9 @@ cifs_create_dfs_fattr(struct cifs_fattr *fattr, struct super_block *sb) fattr->cf_mode = S_IFDIR | S_IXUGO | S_IRWXU; fattr->cf_uid = cifs_sb->mnt_uid; fattr->cf_gid = cifs_sb->mnt_gid; - fattr->cf_atime = CURRENT_TIME; - fattr->cf_ctime = CURRENT_TIME; - fattr->cf_mtime = CURRENT_TIME; + ktime_get_real_ts(&fattr->cf_mtime); + fattr->cf_mtime = timespec_trunc(fattr->cf_mtime, sb->s_time_gran); + fattr->cf_atime = fattr->cf_ctime = fattr->cf_mtime; fattr->cf_nlink = 2; fattr->cf_flags |= CIFS_FATTR_DFS_REFERRAL; } @@ -584,9 +584,10 @@ static int cifs_sfu_mode(struct cifs_fattr *fattr, const unsigned char *path, /* Fill a cifs_fattr struct with info from FILE_ALL_INFO */ static void cifs_all_info_to_fattr(struct cifs_fattr *fattr, FILE_ALL_INFO *info, - struct cifs_sb_info *cifs_sb, bool adjust_tz, + struct super_block *sb, bool adjust_tz, bool symlink) { + struct cifs_sb_info *cifs_sb = CIFS_SB(sb); struct cifs_tcon *tcon = cifs_sb_master_tcon(cifs_sb); memset(fattr, 0, sizeof(*fattr)); @@ -596,8 +597,10 @@ cifs_all_info_to_fattr(struct cifs_fattr *fattr, FILE_ALL_INFO *info, if (info->LastAccessTime) fattr->cf_atime = cifs_NTtimeToUnix(info->LastAccessTime); - else - fattr->cf_atime = CURRENT_TIME; + else { + ktime_get_real_ts(&fattr->cf_atime); + fattr->cf_atime = timespec_trunc(fattr->cf_atime, sb->s_time_gran); + } fattr->cf_ctime = cifs_NTtimeToUnix(info->ChangeTime); fattr->cf_mtime = cifs_NTtimeToUnix(info->LastWriteTime); @@ -657,7 +660,6 @@ cifs_get_file_info(struct file *filp) FILE_ALL_INFO find_data; struct cifs_fattr fattr; struct inode *inode = file_inode(filp); - struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb); struct cifsFileInfo *cfile = filp->private_data; struct cifs_tcon *tcon = tlink_tcon(cfile->tlink); struct TCP_Server_Info *server = tcon->ses->server; @@ -669,7 +671,7 @@ cifs_get_file_info(struct file *filp) rc = server->ops->query_file_info(xid, tcon, &cfile->fid, &find_data); switch (rc) { case 0: - cifs_all_info_to_fattr(&fattr, &find_data, cifs_sb, false, + cifs_all_info_to_fattr(&fattr, &find_data, inode->i_sb, false, false); break; case -EREMOTE: @@ -751,7 +753,7 @@ cifs_get_inode_info(struct inode **inode, const char *full_path, } if (!rc) { - cifs_all_info_to_fattr(&fattr, data, cifs_sb, adjust_tz, + cifs_all_info_to_fattr(&fattr, data, sb, adjust_tz, symlink); } else if (rc == -EREMOTE) { cifs_create_dfs_fattr(&fattr, sb);