diff options
author | Deepa Dinamani <deepa.kernel@gmail.com> | 2019-06-15 12:00:05 -0400 |
---|---|---|
committer | Deepa Dinamani <deepa.kernel@gmail.com> | 2019-08-30 10:27:17 -0400 |
commit | 3818c1907a5e4e8fbd57fb14cea77de7c507111a (patch) | |
tree | 6ecfae43da546781513ca392b18857155da87f1b | |
parent | 50e17c000c467fbc927fc001df99beb4027a5323 (diff) |
timestamp_truncate: Replace users of timespec64_trunc
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>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Jeff Layton <jlayton@kernel.org>
Cc: adrian.hunter@intel.com
Cc: dedekind1@gmail.com
Cc: gregkh@linuxfoundation.org
Cc: hch@lst.de
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
-rw-r--r-- | fs/attr.c | 21 | ||||
-rw-r--r-- | fs/configfs/inode.c | 12 | ||||
-rw-r--r-- | fs/f2fs/file.c | 21 | ||||
-rw-r--r-- | fs/kernfs/inode.c | 7 | ||||
-rw-r--r-- | fs/ntfs/inode.c | 21 | ||||
-rw-r--r-- | fs/ubifs/file.c | 21 |
6 files changed, 57 insertions, 46 deletions
@@ -183,15 +183,18 @@ void setattr_copy(struct inode *inode, const struct iattr *attr) | |||
183 | inode->i_uid = attr->ia_uid; | 183 | inode->i_uid = attr->ia_uid; |
184 | if (ia_valid & ATTR_GID) | 184 | if (ia_valid & ATTR_GID) |
185 | inode->i_gid = attr->ia_gid; | 185 | inode->i_gid = attr->ia_gid; |
186 | if (ia_valid & ATTR_ATIME) | 186 | if (ia_valid & ATTR_ATIME) { |
187 | inode->i_atime = timespec64_trunc(attr->ia_atime, | 187 | inode->i_atime = timestamp_truncate(attr->ia_atime, |
188 | inode->i_sb->s_time_gran); | 188 | inode); |
189 | if (ia_valid & ATTR_MTIME) | 189 | } |
190 | inode->i_mtime = timespec64_trunc(attr->ia_mtime, | 190 | if (ia_valid & ATTR_MTIME) { |
191 | inode->i_sb->s_time_gran); | 191 | inode->i_mtime = timestamp_truncate(attr->ia_mtime, |
192 | if (ia_valid & ATTR_CTIME) | 192 | inode); |
193 | inode->i_ctime = timespec64_trunc(attr->ia_ctime, | 193 | } |
194 | inode->i_sb->s_time_gran); | 194 | if (ia_valid & ATTR_CTIME) { |
195 | inode->i_ctime = timestamp_truncate(attr->ia_ctime, | ||
196 | inode); | ||
197 | } | ||
195 | if (ia_valid & ATTR_MODE) { | 198 | if (ia_valid & ATTR_MODE) { |
196 | umode_t mode = attr->ia_mode; | 199 | umode_t mode = attr->ia_mode; |
197 | 200 | ||
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) | |||
76 | if (ia_valid & ATTR_GID) | 76 | if (ia_valid & ATTR_GID) |
77 | sd_iattr->ia_gid = iattr->ia_gid; | 77 | sd_iattr->ia_gid = iattr->ia_gid; |
78 | if (ia_valid & ATTR_ATIME) | 78 | if (ia_valid & ATTR_ATIME) |
79 | sd_iattr->ia_atime = timespec64_trunc(iattr->ia_atime, | 79 | sd_iattr->ia_atime = timestamp_truncate(iattr->ia_atime, |
80 | inode->i_sb->s_time_gran); | 80 | inode); |
81 | if (ia_valid & ATTR_MTIME) | 81 | if (ia_valid & ATTR_MTIME) |
82 | sd_iattr->ia_mtime = timespec64_trunc(iattr->ia_mtime, | 82 | sd_iattr->ia_mtime = timestamp_truncate(iattr->ia_mtime, |
83 | inode->i_sb->s_time_gran); | 83 | inode); |
84 | if (ia_valid & ATTR_CTIME) | 84 | if (ia_valid & ATTR_CTIME) |
85 | sd_iattr->ia_ctime = timespec64_trunc(iattr->ia_ctime, | 85 | sd_iattr->ia_ctime = timestamp_truncate(iattr->ia_ctime, |
86 | inode->i_sb->s_time_gran); | 86 | inode); |
87 | if (ia_valid & ATTR_MODE) { | 87 | if (ia_valid & ATTR_MODE) { |
88 | umode_t mode = iattr->ia_mode; | 88 | umode_t mode = iattr->ia_mode; |
89 | 89 | ||
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 3e58a6f697dd..95f48f6b1180 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c | |||
@@ -741,15 +741,18 @@ static void __setattr_copy(struct inode *inode, const struct iattr *attr) | |||
741 | inode->i_uid = attr->ia_uid; | 741 | inode->i_uid = attr->ia_uid; |
742 | if (ia_valid & ATTR_GID) | 742 | if (ia_valid & ATTR_GID) |
743 | inode->i_gid = attr->ia_gid; | 743 | inode->i_gid = attr->ia_gid; |
744 | if (ia_valid & ATTR_ATIME) | 744 | if (ia_valid & ATTR_ATIME) { |
745 | inode->i_atime = timespec64_trunc(attr->ia_atime, | 745 | inode->i_atime = timestamp_truncate(attr->ia_atime, |
746 | inode->i_sb->s_time_gran); | 746 | inode); |
747 | if (ia_valid & ATTR_MTIME) | 747 | } |
748 | inode->i_mtime = timespec64_trunc(attr->ia_mtime, | 748 | if (ia_valid & ATTR_MTIME) { |
749 | inode->i_sb->s_time_gran); | 749 | inode->i_mtime = timestamp_truncate(attr->ia_mtime, |
750 | if (ia_valid & ATTR_CTIME) | 750 | inode); |
751 | inode->i_ctime = timespec64_trunc(attr->ia_ctime, | 751 | } |
752 | inode->i_sb->s_time_gran); | 752 | if (ia_valid & ATTR_CTIME) { |
753 | inode->i_ctime = timestamp_truncate(attr->ia_ctime, | ||
754 | inode); | ||
755 | } | ||
753 | if (ia_valid & ATTR_MODE) { | 756 | if (ia_valid & ATTR_MODE) { |
754 | umode_t mode = attr->ia_mode; | 757 | umode_t mode = attr->ia_mode; |
755 | 758 | ||
diff --git a/fs/kernfs/inode.c b/fs/kernfs/inode.c index f3f3984cce80..f3eaa8869f42 100644 --- a/fs/kernfs/inode.c +++ b/fs/kernfs/inode.c | |||
@@ -158,12 +158,11 @@ static inline void set_default_inode_attr(struct inode *inode, umode_t mode) | |||
158 | static inline void set_inode_attr(struct inode *inode, | 158 | static inline void set_inode_attr(struct inode *inode, |
159 | struct kernfs_iattrs *attrs) | 159 | struct kernfs_iattrs *attrs) |
160 | { | 160 | { |
161 | struct super_block *sb = inode->i_sb; | ||
162 | inode->i_uid = attrs->ia_uid; | 161 | inode->i_uid = attrs->ia_uid; |
163 | inode->i_gid = attrs->ia_gid; | 162 | inode->i_gid = attrs->ia_gid; |
164 | inode->i_atime = timespec64_trunc(attrs->ia_atime, sb->s_time_gran); | 163 | inode->i_atime = timestamp_truncate(attrs->ia_atime, inode); |
165 | inode->i_mtime = timespec64_trunc(attrs->ia_mtime, sb->s_time_gran); | 164 | inode->i_mtime = timestamp_truncate(attrs->ia_mtime, inode); |
166 | inode->i_ctime = timespec64_trunc(attrs->ia_ctime, sb->s_time_gran); | 165 | inode->i_ctime = timestamp_truncate(attrs->ia_ctime, inode); |
167 | } | 166 | } |
168 | 167 | ||
169 | static void kernfs_refresh_inode(struct kernfs_node *kn, struct inode *inode) | 168 | 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) | |||
2899 | ia_valid |= ATTR_MTIME | ATTR_CTIME; | 2899 | ia_valid |= ATTR_MTIME | ATTR_CTIME; |
2900 | } | 2900 | } |
2901 | } | 2901 | } |
2902 | if (ia_valid & ATTR_ATIME) | 2902 | if (ia_valid & ATTR_ATIME) { |
2903 | vi->i_atime = timespec64_trunc(attr->ia_atime, | 2903 | vi->i_atime = timestamp_truncate(attr->ia_atime, |
2904 | vi->i_sb->s_time_gran); | 2904 | vi); |
2905 | if (ia_valid & ATTR_MTIME) | 2905 | } |
2906 | vi->i_mtime = timespec64_trunc(attr->ia_mtime, | 2906 | if (ia_valid & ATTR_MTIME) { |
2907 | vi->i_sb->s_time_gran); | 2907 | vi->i_mtime = timestamp_truncate(attr->ia_mtime, |
2908 | if (ia_valid & ATTR_CTIME) | 2908 | vi); |
2909 | vi->i_ctime = timespec64_trunc(attr->ia_ctime, | 2909 | } |
2910 | vi->i_sb->s_time_gran); | 2910 | if (ia_valid & ATTR_CTIME) { |
2911 | vi->i_ctime = timestamp_truncate(attr->ia_ctime, | ||
2912 | vi); | ||
2913 | } | ||
2911 | mark_inode_dirty(vi); | 2914 | mark_inode_dirty(vi); |
2912 | out: | 2915 | out: |
2913 | return err; | 2916 | 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) | |||
1078 | inode->i_uid = attr->ia_uid; | 1078 | inode->i_uid = attr->ia_uid; |
1079 | if (attr->ia_valid & ATTR_GID) | 1079 | if (attr->ia_valid & ATTR_GID) |
1080 | inode->i_gid = attr->ia_gid; | 1080 | inode->i_gid = attr->ia_gid; |
1081 | if (attr->ia_valid & ATTR_ATIME) | 1081 | if (attr->ia_valid & ATTR_ATIME) { |
1082 | inode->i_atime = timespec64_trunc(attr->ia_atime, | 1082 | inode->i_atime = timestamp_truncate(attr->ia_atime, |
1083 | inode->i_sb->s_time_gran); | 1083 | inode); |
1084 | if (attr->ia_valid & ATTR_MTIME) | 1084 | } |
1085 | inode->i_mtime = timespec64_trunc(attr->ia_mtime, | 1085 | if (attr->ia_valid & ATTR_MTIME) { |
1086 | inode->i_sb->s_time_gran); | 1086 | inode->i_mtime = timestamp_truncate(attr->ia_mtime, |
1087 | if (attr->ia_valid & ATTR_CTIME) | 1087 | inode); |
1088 | inode->i_ctime = timespec64_trunc(attr->ia_ctime, | 1088 | } |
1089 | inode->i_sb->s_time_gran); | 1089 | if (attr->ia_valid & ATTR_CTIME) { |
1090 | inode->i_ctime = timestamp_truncate(attr->ia_ctime, | ||
1091 | inode); | ||
1092 | } | ||
1090 | if (attr->ia_valid & ATTR_MODE) { | 1093 | if (attr->ia_valid & ATTR_MODE) { |
1091 | umode_t mode = attr->ia_mode; | 1094 | umode_t mode = attr->ia_mode; |
1092 | 1095 | ||