Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bbd4714 authored by Deepa Dinamani's avatar Deepa Dinamani Committed by Ilya Dryomov
Browse files

ceph: replace CURRENT_TIME by current_fs_time() 



CURRENT_TIME macro is not appropriate for filesystems as it
doesn't use the right granularity for filesystem timestamps.
Use current_fs_time() instead.

Signed-off-by: default avatarDeepa Dinamani <deepa.kernel@gmail.com>
Signed-off-by: default avatarYan, Zheng <zyan@redhat.com>
parent 5b64640c

fs/ceph/file.c

+2 −2
Original line number Diff line number Diff line
@@ -782,7 +782,7 @@ ceph_direct_read_write(struct kiocb *iocb, struct iov_iter *iter, 
	int num_pages = 0;

	int flags;

	int ret;

	struct timespec mtime = CURRENT_TIME;

	struct timespec mtime = current_fs_time(inode->i_sb);

	size_t count = iov_iter_count(iter);

	loff_t pos = iocb->ki_pos;

	bool write = iov_iter_rw(iter) == WRITE;
@@ -986,7 +986,7 @@ ceph_sync_write(struct kiocb *iocb, struct iov_iter *from, loff_t pos, 
	int flags;

	int check_caps = 0;

	int ret;

	struct timespec mtime = CURRENT_TIME;

	struct timespec mtime = current_fs_time(inode->i_sb);

	size_t count = iov_iter_count(from);



	if (ceph_snap(file_inode(file)) != CEPH_NOSNAP)

fs/ceph/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -1950,7 +1950,7 @@ int ceph_setattr(struct dentry *dentry, struct iattr *attr) 
	if (dirtied) {

		inode_dirty_flags = __ceph_mark_dirty_caps(ci, dirtied,

							   &prealloc_cf);

		inode->i_ctime = CURRENT_TIME;

		inode->i_ctime = current_fs_time(inode->i_sb);

	}



	release &= issued;

fs/ceph/mds_client.c

+1 −1
Original line number Diff line number Diff line
@@ -1729,7 +1729,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);



	req->r_stamp = CURRENT_TIME;

	req->r_stamp = current_fs_time(mdsc->fsc->sb);



	req->r_op = op;

	req->r_direct_mode = mode;

fs/ceph/xattr.c

+2 −2
Original line number Diff line number Diff line
@@ -999,7 +999,7 @@ int __ceph_setxattr(struct dentry *dentry, const char *name, 
		dirty = __ceph_mark_dirty_caps(ci, CEPH_CAP_XATTR_EXCL,

					       &prealloc_cf);

		ci->i_xattrs.dirty = true;

		inode->i_ctime = CURRENT_TIME;

		inode->i_ctime = current_fs_time(inode->i_sb);

	}



	spin_unlock(&ci->i_ceph_lock);
@@ -1136,7 +1136,7 @@ int __ceph_removexattr(struct dentry *dentry, const char *name) 
	dirty = __ceph_mark_dirty_caps(ci, CEPH_CAP_XATTR_EXCL,

				       &prealloc_cf);

	ci->i_xattrs.dirty = true;

	inode->i_ctime = CURRENT_TIME;

	inode->i_ctime = current_fs_time(inode->i_sb);

	spin_unlock(&ci->i_ceph_lock);

	if (lock_snap_rwsem)

		up_read(&mdsc->snap_rwsem);