Commit bddea11b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'imm.timestamp' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull vfs timestamp updates from Al Viro:
 "More 64bit timestamp work"

* 'imm.timestamp' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  kernfs: don't bother with timestamp truncation
  fs: Do not overload update_time
  fs: Delete timespec64_trunc()
  fs: ubifs: Eliminate timespec64_trunc() usage
  fs: ceph: Delete timespec64_trunc() usage
  fs: cifs: Delete usage of timespec64_trunc
  fs: fat: Eliminate timespec64_trunc() usage
  utimes: Clamp the timestamps in notify_change()
parents 33b40134 f0f3588f

fs/attr.c

+11 −12
Original line number Diff line number Diff line
@@ -183,18 +183,12 @@ 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 = 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_ATIME)

		inode->i_atime = attr->ia_atime;

	if (ia_valid & ATTR_MTIME)

		inode->i_mtime = attr->ia_mtime;

	if (ia_valid & ATTR_CTIME)

		inode->i_ctime = attr->ia_ctime;

	if (ia_valid & ATTR_MODE) {

		umode_t mode = attr->ia_mode;
@@ -268,8 +262,13 @@ int notify_change(struct dentry * dentry, struct iattr * attr, struct inode **de 
	attr->ia_ctime = now;

	if (!(ia_valid & ATTR_ATIME_SET))

		attr->ia_atime = now;

	else

		attr->ia_atime = timestamp_truncate(attr->ia_atime, inode);

	if (!(ia_valid & ATTR_MTIME_SET))

		attr->ia_mtime = now;

	else

		attr->ia_mtime = timestamp_truncate(attr->ia_mtime, inode);



	if (ia_valid & ATTR_KILL_PRIV) {

		error = security_inode_need_killpriv(dentry);

		if (error < 0)

fs/ceph/mds_client.c

+1 −3
Original line number Diff line number Diff line
@@ -2072,7 +2072,6 @@ struct ceph_mds_request * 
ceph_mdsc_create_request(struct ceph_mds_client *mdsc, int op, int mode)

{

	struct ceph_mds_request *req = kzalloc(sizeof(*req), GFP_NOFS);

	struct timespec64 ts;



	if (!req)

		return ERR_PTR(-ENOMEM);
@@ -2091,8 +2090,7 @@ ceph_mdsc_create_request(struct ceph_mds_client *mdsc, int op, int mode) 
	init_completion(&req->r_safe_completion);

	INIT_LIST_HEAD(&req->r_unsafe_item);



	ktime_get_coarse_real_ts64(&ts);

	req->r_stamp = timespec64_trunc(ts, mdsc->fsc->sb->s_time_gran);

	ktime_get_coarse_real_ts64(&req->r_stamp);



	req->r_op = op;

	req->r_direct_mode = mode;

fs/cifs/inode.c

+7 −6
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ cifs_revalidate_cache(struct inode *inode, struct cifs_fattr *fattr) 
	}



	 /* revalidate if mtime or size have changed */

	fattr->cf_mtime = timestamp_truncate(fattr->cf_mtime, inode);

	if (timespec64_equal(&inode->i_mtime, &fattr->cf_mtime) &&

	    cifs_i->server_eof == fattr->cf_eof) {

		cifs_dbg(FYI, "%s: inode %llu is unchanged\n",
@@ -162,6 +163,9 @@ cifs_fattr_to_inode(struct inode *inode, struct cifs_fattr *fattr) 
	cifs_revalidate_cache(inode, fattr);



	spin_lock(&inode->i_lock);

	fattr->cf_mtime = timestamp_truncate(fattr->cf_mtime, inode);

	fattr->cf_atime = timestamp_truncate(fattr->cf_atime, inode);

	fattr->cf_ctime = timestamp_truncate(fattr->cf_ctime, inode);

	/* we do not want atime to be less than mtime, it broke some apps */

	if (timespec64_compare(&fattr->cf_atime, &fattr->cf_mtime) < 0)

		inode->i_atime = fattr->cf_mtime;
@@ -329,8 +333,7 @@ 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;

	ktime_get_real_ts64(&fattr->cf_mtime);

	fattr->cf_mtime = timespec64_trunc(fattr->cf_mtime, sb->s_time_gran);

	ktime_get_coarse_real_ts64(&fattr->cf_mtime);

	fattr->cf_atime = fattr->cf_ctime = fattr->cf_mtime;

	fattr->cf_nlink = 2;

	fattr->cf_flags = CIFS_FATTR_DFS_REFERRAL;
@@ -609,10 +612,8 @@ cifs_all_info_to_fattr(struct cifs_fattr *fattr, FILE_ALL_INFO *info, 


	if (info->LastAccessTime)

		fattr->cf_atime = cifs_NTtimeToUnix(info->LastAccessTime);

	else {

		ktime_get_real_ts64(&fattr->cf_atime);

		fattr->cf_atime = timespec64_trunc(fattr->cf_atime, sb->s_time_gran);

	}

	else

		ktime_get_coarse_real_ts64(&fattr->cf_atime);



	fattr->cf_ctime = cifs_NTtimeToUnix(info->ChangeTime);

	fattr->cf_mtime = cifs_NTtimeToUnix(info->LastWriteTime);

fs/configfs/inode.c

+3 −6
Original line number Diff line number Diff line
@@ -76,14 +76,11 @@ 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 = timestamp_truncate(iattr->ia_atime,

						      inode);

		sd_iattr->ia_atime = iattr->ia_atime;

	if (ia_valid & ATTR_MTIME)

		sd_iattr->ia_mtime = timestamp_truncate(iattr->ia_mtime,

						      inode);

		sd_iattr->ia_mtime = iattr->ia_mtime;

	if (ia_valid & ATTR_CTIME)

		sd_iattr->ia_ctime = timestamp_truncate(iattr->ia_ctime,

						      inode);

		sd_iattr->ia_ctime = iattr->ia_ctime;

	if (ia_valid & ATTR_MODE) {

		umode_t mode = iattr->ia_mode;

fs/f2fs/file.c

+6 −12
Original line number Diff line number Diff line
@@ -829,18 +829,12 @@ 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 = 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_ATIME)

		inode->i_atime = attr->ia_atime;

	if (ia_valid & ATTR_MTIME)

		inode->i_mtime = attr->ia_mtime;

	if (ia_valid & ATTR_CTIME)

		inode->i_ctime = attr->ia_ctime;

	if (ia_valid & ATTR_MODE) {

		umode_t mode = attr->ia_mode;

CRA Git | Maintained and supported by SUSTech CRA and CCSE