From patchwork Thu Jun 9 05:04:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepa Dinamani X-Patchwork-Id: 9166289 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 AD42460467 for ; Thu, 9 Jun 2016 05:12:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9E65A26490 for ; Thu, 9 Jun 2016 05:12:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9346F282F9; Thu, 9 Jun 2016 05:12:17 +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 263EB26490 for ; Thu, 9 Jun 2016 05:12:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946172AbcFIFLK (ORCPT ); Thu, 9 Jun 2016 01:11:10 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:36462 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1424422AbcFIFFs (ORCPT ); Thu, 9 Jun 2016 01:05:48 -0400 Received: by mail-pf0-f195.google.com with SMTP id 62so2027235pfd.3; Wed, 08 Jun 2016 22:05:48 -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=IpTEPVIf3VDGrvsumqalIfYJqPmK2nStjS7FM3FmtJ0=; b=CfvkvDDKYofNC8eTcpHC7c4F7NsN49HKBbGUySNSjFhRXyDu0L5WaEN645PhH2CHX9 N5Wt+LPHQQ0y+AQnmx5BNHhVAas8TFUkbSpubpFumdOKQTISR7of9wzLRTSwzrRejmyq cpkNEfW9yFqN4NiHr5MnhH4ZxzO7bEay7u35SpFVqGeNY7ZV1XD2Pu/+y/bqKds2ophJ 0yVb7cWV5sodCa/DHLAWhQKxtF1OEM4Y2B6oifyRbeZ1PlTEWwomMv1C34LXtCBseIwo DVOpDBYoppmI0ojJEyi24CMoQPdYcboVL36NyLNffMgv11p14iCj1cmV1l790XvoHcQy l5SA== 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=IpTEPVIf3VDGrvsumqalIfYJqPmK2nStjS7FM3FmtJ0=; b=YQIGSkM7VuQdAXCxSb5cCPpFIQAjMkc10tcO78sAt2+h9grXfHK5uC6X5W/tFIHY4Y ZcSPoiQRbe5wTMrpICPFXjzMEIOgUmXWvtTbWnaHQekyaZtaixwQocc7aWHFiAXEDEw+ qV9UBCaLKbxd2vDIT6RE/Y4Z4gbW7tRQhV3BDVNa9psBOnDLevgiz/eeQNpahhqClYdf RPljUuk1YJut0wRiWcjMUzcZ2Pn5POOzRARJvkFbjwDyI+yox8Nk2+vVy2jFEwMVO4d3 pGtwAYL9vXzZ5C4JXCntNGKr0R9JO3B9Gb2SII9GuAF5Pwm263GXZZApDJll434nl0OY WKyA== X-Gm-Message-State: ALyK8tJ573bNddVbBvEa7YUm/d3QTuzdqzTUcaipt40zMCExk0ByMBzHt7c+k7mDLpodbQ== X-Received: by 10.98.42.73 with SMTP id q70mr2601365pfq.128.1465448748036; Wed, 08 Jun 2016 22:05:48 -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 129sm6220808pfe.3.2016.06.08.22.05.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 08 Jun 2016 22:05:47 -0700 (PDT) From: Deepa Dinamani To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Arnd Bergmann , Thomas Gleixner , Al Viro , Linus Torvalds , y2038@lists.linaro.org, Steve French , linux-cifs@vger.kernel.org, samba-technical@lists.samba.org Subject: [PATCH 07/21] fs: cifs: Replace CURRENT_TIME by current_fs_time() Date: Wed, 8 Jun 2016 22:04:51 -0700 Message-Id: <1465448705-25055-8-git-send-email-deepa.kernel@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1465448705-25055-1-git-send-email-deepa.kernel@gmail.com> References: <1465448705-25055-1-git-send-email-deepa.kernel@gmail.com> Sender: linux-cifs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-cifs@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_fs_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 Cc: linux-cifs@vger.kernel.org Cc: samba-technical@lists.samba.org --- fs/cifs/inode.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index 514dadb..692c98b 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c @@ -320,9 +320,8 @@ 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; + fattr->cf_atime = fattr->cf_ctime = + fattr->cf_mtime = current_fs_time(sb); fattr->cf_nlink = 2; fattr->cf_flags |= CIFS_FATTR_DFS_REFERRAL; } @@ -584,9 +583,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)); @@ -597,7 +597,7 @@ 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; + fattr->cf_atime = current_fs_time(sb); fattr->cf_ctime = cifs_NTtimeToUnix(info->ChangeTime); fattr->cf_mtime = cifs_NTtimeToUnix(info->LastWriteTime); @@ -657,7 +657,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 +668,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 +750,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);