In later patches, we're going to change how the ctime.tv_nsec field is
utilized. Switch to using accessor functions instead of raw accesses of
inode->i_ctime.
Signed-off-by: Jeff Layton <[email protected]>
---
fs/ceph/acl.c | 2 +-
fs/ceph/caps.c | 2 +-
fs/ceph/inode.c | 17 ++++++++++-------
fs/ceph/snap.c | 2 +-
fs/ceph/xattr.c | 2 +-
5 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/fs/ceph/acl.c b/fs/ceph/acl.c
index 6945a938d396..a3de2b9c3a68 100644
--- a/fs/ceph/acl.c
+++ b/fs/ceph/acl.c
@@ -93,7 +93,7 @@ int ceph_set_acl(struct mnt_idmap *idmap, struct dentry *dentry,
char *value = NULL;
struct iattr newattrs;
struct inode *inode = d_inode(dentry);
- struct timespec64 old_ctime = inode->i_ctime;
+ struct timespec64 old_ctime = inode_ctime_peek(inode);
umode_t new_mode = inode->i_mode, old_mode = inode->i_mode;
if (ceph_snap(inode) != CEPH_NOSNAP) {
diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
index 2321e5ddb664..c144a07e334e 100644
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
@@ -1400,7 +1400,7 @@ static void __prep_cap(struct cap_msg_args *arg, struct ceph_cap *cap,
arg->mtime = inode->i_mtime;
arg->atime = inode->i_atime;
- arg->ctime = inode->i_ctime;
+ arg->ctime = inode_ctime_peek(inode);
arg->btime = ci->i_btime;
arg->change_attr = inode_peek_iversion_raw(inode);
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index 8e5f41d45283..f0b3b11d695e 100644
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -100,7 +100,7 @@ struct inode *ceph_get_snapdir(struct inode *parent)
inode->i_uid = parent->i_uid;
inode->i_gid = parent->i_gid;
inode->i_mtime = parent->i_mtime;
- inode->i_ctime = parent->i_ctime;
+ inode_ctime_set(inode, inode_ctime_peek(parent));
inode->i_atime = parent->i_atime;
ci->i_rbytes = 0;
ci->i_btime = ceph_inode(parent)->i_btime;
@@ -695,12 +695,14 @@ void ceph_fill_file_time(struct inode *inode, int issued,
CEPH_CAP_FILE_BUFFER|
CEPH_CAP_AUTH_EXCL|
CEPH_CAP_XATTR_EXCL)) {
+ struct timespec64 ictime = inode_ctime_peek(inode);
+
if (ci->i_version == 0 ||
- timespec64_compare(ctime, &inode->i_ctime) > 0) {
+ timespec64_compare(ctime, &ictime) > 0) {
dout("ctime %lld.%09ld -> %lld.%09ld inc w/ cap\n",
- inode->i_ctime.tv_sec, inode->i_ctime.tv_nsec,
+ ictime.tv_sec, ictime.tv_nsec,
ctime->tv_sec, ctime->tv_nsec);
- inode->i_ctime = *ctime;
+ inode_ctime_set(inode, *ctime);
}
if (ci->i_version == 0 ||
ceph_seq_cmp(time_warp_seq, ci->i_time_warp_seq) > 0) {
@@ -738,7 +740,7 @@ void ceph_fill_file_time(struct inode *inode, int issued,
} else {
/* we have no write|excl caps; whatever the MDS says is true */
if (ceph_seq_cmp(time_warp_seq, ci->i_time_warp_seq) >= 0) {
- inode->i_ctime = *ctime;
+ inode_ctime_set(inode, *ctime);
inode->i_mtime = *mtime;
inode->i_atime = *atime;
ci->i_time_warp_seq = time_warp_seq;
@@ -2166,7 +2168,8 @@ int __ceph_setattr(struct inode *inode, struct iattr *attr)
bool only = (ia_valid & (ATTR_SIZE|ATTR_MTIME|ATTR_ATIME|
ATTR_MODE|ATTR_UID|ATTR_GID)) == 0;
dout("setattr %p ctime %lld.%ld -> %lld.%ld (%s)\n", inode,
- inode->i_ctime.tv_sec, inode->i_ctime.tv_nsec,
+ inode_ctime_peek(inode).tv_sec,
+ inode_ctime_peek(inode).tv_nsec,
attr->ia_ctime.tv_sec, attr->ia_ctime.tv_nsec,
only ? "ctime only" : "ignored");
if (only) {
@@ -2191,7 +2194,7 @@ int __ceph_setattr(struct inode *inode, struct iattr *attr)
if (dirtied) {
inode_dirty_flags = __ceph_mark_dirty_caps(ci, dirtied,
&prealloc_cf);
- inode->i_ctime = attr->ia_ctime;
+ inode_ctime_set(inode, attr->ia_ctime);
inode_inc_iversion_raw(inode);
}
diff --git a/fs/ceph/snap.c b/fs/ceph/snap.c
index 2e73ba62bd7a..f02df070fa84 100644
--- a/fs/ceph/snap.c
+++ b/fs/ceph/snap.c
@@ -660,7 +660,7 @@ int __ceph_finish_cap_snap(struct ceph_inode_info *ci,
capsnap->size = i_size_read(inode);
capsnap->mtime = inode->i_mtime;
capsnap->atime = inode->i_atime;
- capsnap->ctime = inode->i_ctime;
+ capsnap->ctime = inode_ctime_peek(inode);
capsnap->btime = ci->i_btime;
capsnap->change_attr = inode_peek_iversion_raw(inode);
capsnap->time_warp_seq = ci->i_time_warp_seq;
diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c
index 806183959c47..8e217f7f58bd 100644
--- a/fs/ceph/xattr.c
+++ b/fs/ceph/xattr.c
@@ -1238,7 +1238,7 @@ int __ceph_setxattr(struct inode *inode, 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);
+ inode_ctime_set_current(inode);
}
spin_unlock(&ci->i_ceph_lock);
--
2.41.0
On 6/21/23 22:45, Jeff Layton wrote:
> In later patches, we're going to change how the ctime.tv_nsec field is
> utilized. Switch to using accessor functions instead of raw accesses of
> inode->i_ctime.
>
> Signed-off-by: Jeff Layton <[email protected]>
> ---
> fs/ceph/acl.c | 2 +-
> fs/ceph/caps.c | 2 +-
> fs/ceph/inode.c | 17 ++++++++++-------
> fs/ceph/snap.c | 2 +-
> fs/ceph/xattr.c | 2 +-
> 5 files changed, 14 insertions(+), 11 deletions(-)
>
> diff --git a/fs/ceph/acl.c b/fs/ceph/acl.c
> index 6945a938d396..a3de2b9c3a68 100644
> --- a/fs/ceph/acl.c
> +++ b/fs/ceph/acl.c
> @@ -93,7 +93,7 @@ int ceph_set_acl(struct mnt_idmap *idmap, struct dentry *dentry,
> char *value = NULL;
> struct iattr newattrs;
> struct inode *inode = d_inode(dentry);
> - struct timespec64 old_ctime = inode->i_ctime;
> + struct timespec64 old_ctime = inode_ctime_peek(inode);
> umode_t new_mode = inode->i_mode, old_mode = inode->i_mode;
>
> if (ceph_snap(inode) != CEPH_NOSNAP) {
> diff --git a/fs/ceph/caps.c b/fs/ceph/caps.c
> index 2321e5ddb664..c144a07e334e 100644
> --- a/fs/ceph/caps.c
> +++ b/fs/ceph/caps.c
> @@ -1400,7 +1400,7 @@ static void __prep_cap(struct cap_msg_args *arg, struct ceph_cap *cap,
>
> arg->mtime = inode->i_mtime;
> arg->atime = inode->i_atime;
> - arg->ctime = inode->i_ctime;
> + arg->ctime = inode_ctime_peek(inode);
> arg->btime = ci->i_btime;
> arg->change_attr = inode_peek_iversion_raw(inode);
>
> diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
> index 8e5f41d45283..f0b3b11d695e 100644
> --- a/fs/ceph/inode.c
> +++ b/fs/ceph/inode.c
> @@ -100,7 +100,7 @@ struct inode *ceph_get_snapdir(struct inode *parent)
> inode->i_uid = parent->i_uid;
> inode->i_gid = parent->i_gid;
> inode->i_mtime = parent->i_mtime;
> - inode->i_ctime = parent->i_ctime;
> + inode_ctime_set(inode, inode_ctime_peek(parent));
> inode->i_atime = parent->i_atime;
> ci->i_rbytes = 0;
> ci->i_btime = ceph_inode(parent)->i_btime;
> @@ -695,12 +695,14 @@ void ceph_fill_file_time(struct inode *inode, int issued,
> CEPH_CAP_FILE_BUFFER|
> CEPH_CAP_AUTH_EXCL|
> CEPH_CAP_XATTR_EXCL)) {
> + struct timespec64 ictime = inode_ctime_peek(inode);
> +
> if (ci->i_version == 0 ||
> - timespec64_compare(ctime, &inode->i_ctime) > 0) {
> + timespec64_compare(ctime, &ictime) > 0) {
> dout("ctime %lld.%09ld -> %lld.%09ld inc w/ cap\n",
> - inode->i_ctime.tv_sec, inode->i_ctime.tv_nsec,
> + ictime.tv_sec, ictime.tv_nsec,
> ctime->tv_sec, ctime->tv_nsec);
> - inode->i_ctime = *ctime;
> + inode_ctime_set(inode, *ctime);
> }
> if (ci->i_version == 0 ||
> ceph_seq_cmp(time_warp_seq, ci->i_time_warp_seq) > 0) {
> @@ -738,7 +740,7 @@ void ceph_fill_file_time(struct inode *inode, int issued,
> } else {
> /* we have no write|excl caps; whatever the MDS says is true */
> if (ceph_seq_cmp(time_warp_seq, ci->i_time_warp_seq) >= 0) {
> - inode->i_ctime = *ctime;
> + inode_ctime_set(inode, *ctime);
> inode->i_mtime = *mtime;
> inode->i_atime = *atime;
> ci->i_time_warp_seq = time_warp_seq;
> @@ -2166,7 +2168,8 @@ int __ceph_setattr(struct inode *inode, struct iattr *attr)
> bool only = (ia_valid & (ATTR_SIZE|ATTR_MTIME|ATTR_ATIME|
> ATTR_MODE|ATTR_UID|ATTR_GID)) == 0;
> dout("setattr %p ctime %lld.%ld -> %lld.%ld (%s)\n", inode,
> - inode->i_ctime.tv_sec, inode->i_ctime.tv_nsec,
> + inode_ctime_peek(inode).tv_sec,
> + inode_ctime_peek(inode).tv_nsec,
> attr->ia_ctime.tv_sec, attr->ia_ctime.tv_nsec,
> only ? "ctime only" : "ignored");
> if (only) {
> @@ -2191,7 +2194,7 @@ int __ceph_setattr(struct inode *inode, struct iattr *attr)
> if (dirtied) {
> inode_dirty_flags = __ceph_mark_dirty_caps(ci, dirtied,
> &prealloc_cf);
> - inode->i_ctime = attr->ia_ctime;
> + inode_ctime_set(inode, attr->ia_ctime);
> inode_inc_iversion_raw(inode);
> }
>
> diff --git a/fs/ceph/snap.c b/fs/ceph/snap.c
> index 2e73ba62bd7a..f02df070fa84 100644
> --- a/fs/ceph/snap.c
> +++ b/fs/ceph/snap.c
> @@ -660,7 +660,7 @@ int __ceph_finish_cap_snap(struct ceph_inode_info *ci,
> capsnap->size = i_size_read(inode);
> capsnap->mtime = inode->i_mtime;
> capsnap->atime = inode->i_atime;
> - capsnap->ctime = inode->i_ctime;
> + capsnap->ctime = inode_ctime_peek(inode);
> capsnap->btime = ci->i_btime;
> capsnap->change_attr = inode_peek_iversion_raw(inode);
> capsnap->time_warp_seq = ci->i_time_warp_seq;
> diff --git a/fs/ceph/xattr.c b/fs/ceph/xattr.c
> index 806183959c47..8e217f7f58bd 100644
> --- a/fs/ceph/xattr.c
> +++ b/fs/ceph/xattr.c
> @@ -1238,7 +1238,7 @@ int __ceph_setxattr(struct inode *inode, 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);
> + inode_ctime_set_current(inode);
> }
>
> spin_unlock(&ci->i_ceph_lock);
Just back from PTO.
LGTM.
Reviewed-by: Xiubo Li <[email protected]>