tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Deepa Dinamani 3818c190 50e17c00

+57 -46
+12 -9
fs/attr.c
··· 183 183 inode->i_uid = attr->ia_uid; 184 184 if (ia_valid & ATTR_GID) 185 185 inode->i_gid = attr->ia_gid; 186 - if (ia_valid & ATTR_ATIME) 187 - inode->i_atime = timespec64_trunc(attr->ia_atime, 188 - inode->i_sb->s_time_gran); 189 - if (ia_valid & ATTR_MTIME) 190 - inode->i_mtime = timespec64_trunc(attr->ia_mtime, 191 - inode->i_sb->s_time_gran); 192 - if (ia_valid & ATTR_CTIME) 193 - inode->i_ctime = timespec64_trunc(attr->ia_ctime, 194 - inode->i_sb->s_time_gran); 186 + if (ia_valid & ATTR_ATIME) { 187 + inode->i_atime = timestamp_truncate(attr->ia_atime, 188 + inode); 189 + } 190 + if (ia_valid & ATTR_MTIME) { 191 + inode->i_mtime = timestamp_truncate(attr->ia_mtime, 192 + inode); 193 + } 194 + if (ia_valid & ATTR_CTIME) { 195 + inode->i_ctime = timestamp_truncate(attr->ia_ctime, 196 + inode); 197 + } 195 198 if (ia_valid & ATTR_MODE) { 196 199 umode_t mode = attr->ia_mode; 197 200
+6 -6
fs/configfs/inode.c
··· 76 76 if (ia_valid & ATTR_GID) 77 77 sd_iattr->ia_gid = iattr->ia_gid; 78 78 if (ia_valid & ATTR_ATIME) 79 - sd_iattr->ia_atime = timespec64_trunc(iattr->ia_atime, 80 - inode->i_sb->s_time_gran); 79 + sd_iattr->ia_atime = timestamp_truncate(iattr->ia_atime, 80 + inode); 81 81 if (ia_valid & ATTR_MTIME) 82 - sd_iattr->ia_mtime = timespec64_trunc(iattr->ia_mtime, 83 - inode->i_sb->s_time_gran); 82 + sd_iattr->ia_mtime = timestamp_truncate(iattr->ia_mtime, 83 + inode); 84 84 if (ia_valid & ATTR_CTIME) 85 - sd_iattr->ia_ctime = timespec64_trunc(iattr->ia_ctime, 86 - inode->i_sb->s_time_gran); 85 + sd_iattr->ia_ctime = timestamp_truncate(iattr->ia_ctime, 86 + inode); 87 87 if (ia_valid & ATTR_MODE) { 88 88 umode_t mode = iattr->ia_mode; 89 89
+12 -9
fs/f2fs/file.c
··· 741 741 inode->i_uid = attr->ia_uid; 742 742 if (ia_valid & ATTR_GID) 743 743 inode->i_gid = attr->ia_gid; 744 - if (ia_valid & ATTR_ATIME) 745 - inode->i_atime = timespec64_trunc(attr->ia_atime, 746 - inode->i_sb->s_time_gran); 747 - if (ia_valid & ATTR_MTIME) 748 - inode->i_mtime = timespec64_trunc(attr->ia_mtime, 749 - inode->i_sb->s_time_gran); 750 - if (ia_valid & ATTR_CTIME) 751 - inode->i_ctime = timespec64_trunc(attr->ia_ctime, 752 - inode->i_sb->s_time_gran); 744 + if (ia_valid & ATTR_ATIME) { 745 + inode->i_atime = timestamp_truncate(attr->ia_atime, 746 + inode); 747 + } 748 + if (ia_valid & ATTR_MTIME) { 749 + inode->i_mtime = timestamp_truncate(attr->ia_mtime, 750 + inode); 751 + } 752 + if (ia_valid & ATTR_CTIME) { 753 + inode->i_ctime = timestamp_truncate(attr->ia_ctime, 754 + inode); 755 + } 753 756 if (ia_valid & ATTR_MODE) { 754 757 umode_t mode = attr->ia_mode; 755 758
+3 -4
fs/kernfs/inode.c
··· 158 158 static inline void set_inode_attr(struct inode *inode, 159 159 struct kernfs_iattrs *attrs) 160 160 { 161 - struct super_block *sb = inode->i_sb; 162 161 inode->i_uid = attrs->ia_uid; 163 162 inode->i_gid = attrs->ia_gid; 164 - inode->i_atime = timespec64_trunc(attrs->ia_atime, sb->s_time_gran); 165 - inode->i_mtime = timespec64_trunc(attrs->ia_mtime, sb->s_time_gran); 166 - inode->i_ctime = timespec64_trunc(attrs->ia_ctime, sb->s_time_gran); 163 + inode->i_atime = timestamp_truncate(attrs->ia_atime, inode); 164 + inode->i_mtime = timestamp_truncate(attrs->ia_mtime, inode); 165 + inode->i_ctime = timestamp_truncate(attrs->ia_ctime, inode); 167 166 } 168 167 169 168 static void kernfs_refresh_inode(struct kernfs_node *kn, struct inode *inode)
+12 -9
fs/ntfs/inode.c
··· 2899 2899 ia_valid |= ATTR_MTIME | ATTR_CTIME; 2900 2900 } 2901 2901 } 2902 - if (ia_valid & ATTR_ATIME) 2903 - vi->i_atime = timespec64_trunc(attr->ia_atime, 2904 - vi->i_sb->s_time_gran); 2905 - if (ia_valid & ATTR_MTIME) 2906 - vi->i_mtime = timespec64_trunc(attr->ia_mtime, 2907 - vi->i_sb->s_time_gran); 2908 - if (ia_valid & ATTR_CTIME) 2909 - vi->i_ctime = timespec64_trunc(attr->ia_ctime, 2910 - vi->i_sb->s_time_gran); 2902 + if (ia_valid & ATTR_ATIME) { 2903 + vi->i_atime = timestamp_truncate(attr->ia_atime, 2904 + vi); 2905 + } 2906 + if (ia_valid & ATTR_MTIME) { 2907 + vi->i_mtime = timestamp_truncate(attr->ia_mtime, 2908 + vi); 2909 + } 2910 + if (ia_valid & ATTR_CTIME) { 2911 + vi->i_ctime = timestamp_truncate(attr->ia_ctime, 2912 + vi); 2913 + } 2911 2914 mark_inode_dirty(vi); 2912 2915 out: 2913 2916 return err;
+12 -9
fs/ubifs/file.c
··· 1078 1078 inode->i_uid = attr->ia_uid; 1079 1079 if (attr->ia_valid & ATTR_GID) 1080 1080 inode->i_gid = attr->ia_gid; 1081 - if (attr->ia_valid & ATTR_ATIME) 1082 - inode->i_atime = timespec64_trunc(attr->ia_atime, 1083 - inode->i_sb->s_time_gran); 1084 - if (attr->ia_valid & ATTR_MTIME) 1085 - inode->i_mtime = timespec64_trunc(attr->ia_mtime, 1086 - inode->i_sb->s_time_gran); 1087 - if (attr->ia_valid & ATTR_CTIME) 1088 - inode->i_ctime = timespec64_trunc(attr->ia_ctime, 1089 - inode->i_sb->s_time_gran); 1081 + if (attr->ia_valid & ATTR_ATIME) { 1082 + inode->i_atime = timestamp_truncate(attr->ia_atime, 1083 + inode); 1084 + } 1085 + if (attr->ia_valid & ATTR_MTIME) { 1086 + inode->i_mtime = timestamp_truncate(attr->ia_mtime, 1087 + inode); 1088 + } 1089 + if (attr->ia_valid & ATTR_CTIME) { 1090 + inode->i_ctime = timestamp_truncate(attr->ia_ctime, 1091 + inode); 1092 + } 1090 1093 if (attr->ia_valid & ATTR_MODE) { 1091 1094 umode_t mode = attr->ia_mode; 1092 1095