From: Deepa Dinamani <deepa.kernel@gmail.com>
To: viro@zeniv.linux.org.uk, linux-kernel@vger.kernel.org
Cc: linux-fsdevel@vger.kernel.org, arnd@arndb.de,
y2038@lists.linaro.org, adrian.hunter@intel.com,
anton@tuxera.com, dedekind1@gmail.com,
gregkh@linuxfoundation.org, hch@lst.de,
hirofumi@mail.parknet.co.jp, jaegeuk@kernel.org,
jlbec@evilplan.org, richard@nod.at, tj@kernel.org,
yuchao0@huawei.com, linux-f2fs-devel@lists.sourceforge.net,
linux-ntfs-dev@lists.sourceforge.net,
linux-mtd@lists.infradead.org
Subject: [PATCH 03/20] timestamp_truncate: Replace users of timespec64_trunc
Date: Mon, 29 Jul 2019 18:49:07 -0700 [thread overview]
Message-ID: <20190730014924.2193-4-deepa.kernel@gmail.com> (raw)
In-Reply-To: <20190730014924.2193-1-deepa.kernel@gmail.com>
Update the inode timestamp updates to use timestamp_truncate()
instead of timespec64_trunc().
The change was mostly generated by the following coccinelle
script.
virtual context
virtual patch
@r1 depends on patch forall@
struct inode *inode;
identifier i_xtime =~ "^i_[acm]time$";
expression e;
@@
inode->i_xtime =
- timespec64_trunc(
+ timestamp_truncate(
...,
- e);
+ inode);
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Cc: adrian.hunter@intel.com
Cc: anton@tuxera.com
Cc: dedekind1@gmail.com
Cc: gregkh@linuxfoundation.org
Cc: hch@lst.de
Cc: hirofumi@mail.parknet.co.jp
Cc: jaegeuk@kernel.org
Cc: jlbec@evilplan.org
Cc: richard@nod.at
Cc: tj@kernel.org
Cc: yuchao0@huawei.com
Cc: linux-f2fs-devel@lists.sourceforge.net
Cc: linux-ntfs-dev@lists.sourceforge.net
Cc: linux-mtd@lists.infradead.org
---
fs/attr.c | 21 ++++++++++++---------
fs/configfs/inode.c | 12 ++++++------
fs/f2fs/file.c | 21 ++++++++++++---------
fs/fat/misc.c | 5 +++--
fs/kernfs/inode.c | 6 +++---
fs/ntfs/inode.c | 21 ++++++++++++---------
fs/ubifs/file.c | 21 ++++++++++++---------
7 files changed, 60 insertions(+), 47 deletions(-)
diff --git a/fs/attr.c b/fs/attr.c
index d22e8187477f..df28035aa23e 100644
--- a/fs/attr.c
+++ b/fs/attr.c
@@ -183,15 +183,18 @@ void setattr_copy(struct inode *inode, const struct iattr *attr)
inode->i_uid = attr->ia_uid;
if (ia_valid & ATTR_GID)
inode->i_gid = attr->ia_gid;
- if (ia_valid & ATTR_ATIME)
- inode->i_atime = timespec64_trunc(attr->ia_atime,
- inode->i_sb->s_time_gran);
- if (ia_valid & ATTR_MTIME)
- inode->i_mtime = timespec64_trunc(attr->ia_mtime,
- inode->i_sb->s_time_gran);
- if (ia_valid & ATTR_CTIME)
- inode->i_ctime = timespec64_trunc(attr->ia_ctime,
- inode->i_sb->s_time_gran);
+ if (ia_valid & ATTR_ATIME) {
+ inode->i_atime = timestamp_truncate(attr->ia_atime,
+ inode);
+ }
+ if (ia_valid & ATTR_MTIME) {
+ inode->i_mtime = timestamp_truncate(attr->ia_mtime,
+ inode);
+ }
+ if (ia_valid & ATTR_CTIME) {
+ inode->i_ctime = timestamp_truncate(attr->ia_ctime,
+ inode);
+ }
if (ia_valid & ATTR_MODE) {
umode_t mode = attr->ia_mode;
diff --git a/fs/configfs/inode.c b/fs/configfs/inode.c
index ab0284321912..884dcf06cfbe 100644
--- a/fs/configfs/inode.c
+++ b/fs/configfs/inode.c
@@ -76,14 +76,14 @@ int configfs_setattr(struct dentry * dentry, struct iattr * iattr)
if (ia_valid & ATTR_GID)
sd_iattr->ia_gid = iattr->ia_gid;
if (ia_valid & ATTR_ATIME)
- sd_iattr->ia_atime = timespec64_trunc(iattr->ia_atime,
- inode->i_sb->s_time_gran);
+ sd_iattr->ia_atime = timestamp_truncate(iattr->ia_atime,
+ inode);
if (ia_valid & ATTR_MTIME)
- sd_iattr->ia_mtime = timespec64_trunc(iattr->ia_mtime,
- inode->i_sb->s_time_gran);
+ sd_iattr->ia_mtime = timestamp_truncate(iattr->ia_mtime,
+ inode);
if (ia_valid & ATTR_CTIME)
- sd_iattr->ia_ctime = timespec64_trunc(iattr->ia_ctime,
- inode->i_sb->s_time_gran);
+ sd_iattr->ia_ctime = timestamp_truncate(iattr->ia_ctime,
+ inode);
if (ia_valid & ATTR_MODE) {
umode_t mode = iattr->ia_mode;
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 45b45f37d347..faf1e160961b 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -744,15 +744,18 @@ static void __setattr_copy(struct inode *inode, const struct iattr *attr)
inode->i_uid = attr->ia_uid;
if (ia_valid & ATTR_GID)
inode->i_gid = attr->ia_gid;
- if (ia_valid & ATTR_ATIME)
- inode->i_atime = timespec64_trunc(attr->ia_atime,
- inode->i_sb->s_time_gran);
- if (ia_valid & ATTR_MTIME)
- inode->i_mtime = timespec64_trunc(attr->ia_mtime,
- inode->i_sb->s_time_gran);
- if (ia_valid & ATTR_CTIME)
- inode->i_ctime = timespec64_trunc(attr->ia_ctime,
- inode->i_sb->s_time_gran);
+ if (ia_valid & ATTR_ATIME) {
+ inode->i_atime = timestamp_truncate(attr->ia_atime,
+ inode);
+ }
+ if (ia_valid & ATTR_MTIME) {
+ inode->i_mtime = timestamp_truncate(attr->ia_mtime,
+ inode);
+ }
+ if (ia_valid & ATTR_CTIME) {
+ inode->i_ctime = timestamp_truncate(attr->ia_ctime,
+ inode);
+ }
if (ia_valid & ATTR_MODE) {
umode_t mode = attr->ia_mode;
diff --git a/fs/fat/misc.c b/fs/fat/misc.c
index 1e08bd54c5fb..53bb7c6bf993 100644
--- a/fs/fat/misc.c
+++ b/fs/fat/misc.c
@@ -307,8 +307,9 @@ int fat_truncate_time(struct inode *inode, struct timespec64 *now, int flags)
inode->i_atime = (struct timespec64){ seconds, 0 };
}
if (flags & S_CTIME) {
- if (sbi->options.isvfat)
- inode->i_ctime = timespec64_trunc(*now, 10000000);
+ if (sbi->options.isvfat) {
+ inode->i_ctime = timestamp_truncate(*now, inode);
+ }
else
inode->i_ctime = fat_timespec64_trunc_2secs(*now);
}
diff --git a/fs/kernfs/inode.c b/fs/kernfs/inode.c
index f3f3984cce80..892a58cfe7a1 100644
--- a/fs/kernfs/inode.c
+++ b/fs/kernfs/inode.c
@@ -161,9 +161,9 @@ static inline void set_inode_attr(struct inode *inode,
struct super_block *sb = inode->i_sb;
inode->i_uid = attrs->ia_uid;
inode->i_gid = attrs->ia_gid;
- inode->i_atime = timespec64_trunc(attrs->ia_atime, sb->s_time_gran);
- inode->i_mtime = timespec64_trunc(attrs->ia_mtime, sb->s_time_gran);
- inode->i_ctime = timespec64_trunc(attrs->ia_ctime, sb->s_time_gran);
+ inode->i_atime = timestamp_truncate(attrs->ia_atime, inode);
+ inode->i_mtime = timestamp_truncate(attrs->ia_mtime, inode);
+ inode->i_ctime = timestamp_truncate(attrs->ia_ctime, inode);
}
static void kernfs_refresh_inode(struct kernfs_node *kn, struct inode *inode)
diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c
index 8baa34baf548..6c7388430ad3 100644
--- a/fs/ntfs/inode.c
+++ b/fs/ntfs/inode.c
@@ -2899,15 +2899,18 @@ int ntfs_setattr(struct dentry *dentry, struct iattr *attr)
ia_valid |= ATTR_MTIME | ATTR_CTIME;
}
}
- if (ia_valid & ATTR_ATIME)
- vi->i_atime = timespec64_trunc(attr->ia_atime,
- vi->i_sb->s_time_gran);
- if (ia_valid & ATTR_MTIME)
- vi->i_mtime = timespec64_trunc(attr->ia_mtime,
- vi->i_sb->s_time_gran);
- if (ia_valid & ATTR_CTIME)
- vi->i_ctime = timespec64_trunc(attr->ia_ctime,
- vi->i_sb->s_time_gran);
+ if (ia_valid & ATTR_ATIME) {
+ vi->i_atime = timestamp_truncate(attr->ia_atime,
+ vi);
+ }
+ if (ia_valid & ATTR_MTIME) {
+ vi->i_mtime = timestamp_truncate(attr->ia_mtime,
+ vi);
+ }
+ if (ia_valid & ATTR_CTIME) {
+ vi->i_ctime = timestamp_truncate(attr->ia_ctime,
+ vi);
+ }
mark_inode_dirty(vi);
out:
return err;
diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c
index 400970d740bb..cd52585c8f4f 100644
--- a/fs/ubifs/file.c
+++ b/fs/ubifs/file.c
@@ -1078,15 +1078,18 @@ static void do_attr_changes(struct inode *inode, const struct iattr *attr)
inode->i_uid = attr->ia_uid;
if (attr->ia_valid & ATTR_GID)
inode->i_gid = attr->ia_gid;
- if (attr->ia_valid & ATTR_ATIME)
- inode->i_atime = timespec64_trunc(attr->ia_atime,
- inode->i_sb->s_time_gran);
- if (attr->ia_valid & ATTR_MTIME)
- inode->i_mtime = timespec64_trunc(attr->ia_mtime,
- inode->i_sb->s_time_gran);
- if (attr->ia_valid & ATTR_CTIME)
- inode->i_ctime = timespec64_trunc(attr->ia_ctime,
- inode->i_sb->s_time_gran);
+ if (attr->ia_valid & ATTR_ATIME) {
+ inode->i_atime = timestamp_truncate(attr->ia_atime,
+ inode);
+ }
+ if (attr->ia_valid & ATTR_MTIME) {
+ inode->i_mtime = timestamp_truncate(attr->ia_mtime,
+ inode);
+ }
+ if (attr->ia_valid & ATTR_CTIME) {
+ inode->i_ctime = timestamp_truncate(attr->ia_ctime,
+ inode);
+ }
if (attr->ia_valid & ATTR_MODE) {
umode_t mode = attr->ia_mode;
--
2.17.1
next prev parent reply other threads:[~2019-07-30 1:50 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-30 1:49 [PATCH 00/20] vfs: Add support for timestamp limits Deepa Dinamani
2019-07-30 1:49 ` [PATCH 01/20] vfs: Add file timestamp range support Deepa Dinamani
2019-07-30 1:49 ` [PATCH 02/20] vfs: Add timestamp_truncate() api Deepa Dinamani
2019-07-30 1:49 ` Deepa Dinamani [this message]
2019-07-30 8:27 ` [PATCH 03/20] timestamp_truncate: Replace users of timespec64_trunc OGAWA Hirofumi
2019-07-30 17:26 ` Deepa Dinamani
2019-07-30 22:28 ` Anton Altaparmakov
2019-07-31 0:08 ` Deepa Dinamani
2019-07-30 1:49 ` [PATCH 04/20] mount: Add mount warning for impending timestamp expiry Deepa Dinamani
2019-08-05 14:12 ` [Y2038] " Ben Hutchings
2019-08-05 14:40 ` Arnd Bergmann
2019-08-10 20:47 ` Deepa Dinamani
2019-08-05 14:14 ` Ben Hutchings
2019-08-10 20:44 ` Deepa Dinamani
2019-08-12 13:25 ` Ben Hutchings
2019-08-12 14:11 ` Arnd Bergmann
2019-08-12 16:09 ` Deepa Dinamani
2019-08-12 16:15 ` Deepa Dinamani
2019-08-12 17:43 ` Ben Hutchings
2019-07-30 1:49 ` [PATCH 05/20] utimes: Clamp the timestamps before update Deepa Dinamani
2019-07-31 15:14 ` Darrick J. Wong
2019-07-31 15:33 ` Deepa Dinamani
2019-08-05 13:30 ` [Y2038] " Ben Hutchings
2019-08-10 20:36 ` Deepa Dinamani
2019-07-30 1:49 ` [PATCH 06/20] fs: Fill in max and min timestamps in superblock Deepa Dinamani
2019-07-31 15:28 ` Darrick J. Wong
2019-07-30 1:49 ` [PATCH 07/20] 9p: Fill min and max timestamps in sb Deepa Dinamani
2019-07-30 1:49 ` [PATCH 08/20] adfs: Fill in max and min " Deepa Dinamani
2019-07-30 1:49 ` [PATCH 09/20] ext4: Initialize timestamps limits Deepa Dinamani
2019-07-31 15:26 ` Darrick J. Wong
2019-08-01 19:18 ` Deepa Dinamani
2019-08-01 22:43 ` Theodore Y. Ts'o
2019-08-02 10:39 ` Arnd Bergmann
2019-08-02 15:43 ` Theodore Y. Ts'o
2019-08-02 19:00 ` Arnd Bergmann
2019-08-02 21:39 ` Theodore Y. Ts'o
2019-08-03 9:30 ` Arnd Bergmann
2019-08-03 16:02 ` Theodore Y. Ts'o
2019-08-03 20:24 ` Arnd Bergmann
2019-08-07 18:04 ` Andreas Dilger
2019-08-08 18:27 ` Deepa Dinamani
2019-07-30 1:49 ` [PATCH 10/20] fs: nfs: Initialize filesystem timestamp ranges Deepa Dinamani
2019-07-30 1:49 ` [PATCH 11/20] fs: cifs: " Deepa Dinamani
2019-07-30 1:49 ` [PATCH 12/20] fs: fat: " Deepa Dinamani
2019-07-30 9:31 ` OGAWA Hirofumi
2019-07-30 17:39 ` Deepa Dinamani
2019-07-31 0:48 ` OGAWA Hirofumi
2019-07-30 1:49 ` [PATCH 13/20] fs: affs: " Deepa Dinamani
2019-08-01 11:28 ` David Sterba
2019-07-30 1:49 ` [PATCH 14/20] fs: sysv: " Deepa Dinamani
2019-07-30 1:49 ` [PATCH 15/20] fs: ceph: " Deepa Dinamani
2019-07-30 1:49 ` [PATCH 16/20] fs: orangefs: " Deepa Dinamani
2019-07-30 1:49 ` [PATCH 17/20] fs: hpfs: " Deepa Dinamani
2019-07-30 1:49 ` [PATCH 18/20] fs: omfs: " Deepa Dinamani
2019-07-30 14:25 ` Bob Copeland
2019-07-30 1:49 ` [PATCH 19/20] pstore: fs superblock limits Deepa Dinamani
2019-07-30 4:31 ` Kees Cook
2019-07-30 7:36 ` Arnd Bergmann
2019-08-02 2:26 ` Deepa Dinamani
2019-08-02 7:15 ` Arnd Bergmann
2019-08-18 14:00 ` Deepa Dinamani
2019-07-30 1:49 ` [PATCH 20/20] isofs: Initialize filesystem timestamp ranges Deepa Dinamani
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=20190730014924.2193-4-deepa.kernel@gmail.com \
--to=deepa.kernel@gmail.com \
--cc=adrian.hunter@intel.com \
--cc=anton@tuxera.com \
--cc=arnd@arndb.de \
--cc=dedekind1@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=hch@lst.de \
--cc=hirofumi@mail.parknet.co.jp \
--cc=jaegeuk@kernel.org \
--cc=jlbec@evilplan.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-ntfs-dev@lists.sourceforge.net \
--cc=richard@nod.at \
--cc=tj@kernel.org \
--cc=viro@zeniv.linux.org.uk \
--cc=y2038@lists.linaro.org \
--cc=yuchao0@huawei.com \
/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).