From: Max Kellermann <max.kellermann@ionos.com>
To: idryomov@gmail.com, amarkuze@redhat.com,
ceph-devel@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Max Kellermann <max.kellermann@ionos.com>
Subject: [PATCH v2 06/18] fs/ceph: consistently use `u32` for `time_warp_seq`
Date: Mon, 6 Jul 2026 09:24:37 +0200 [thread overview]
Message-ID: <20260706072450.3920010-7-max.kellermann@ionos.com> (raw)
In-Reply-To: <20260706072450.3920010-1-max.kellermann@ionos.com>
Previously, both `u32` and `u64` was used with implicit casts. All
this does is add useless overhead.
This will allow better struct packing in `struct ceph_cap_snap`.
Signed-off-by: Max Kellermann <max.kellermann@ionos.com>
---
fs/ceph/inode.c | 6 +++---
fs/ceph/super.h | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fs/ceph/inode.c b/fs/ceph/inode.c
index cd1e09c32eba..e79ba09f2cdf 100644
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
@@ -916,7 +916,7 @@ void ceph_inode_set_subvolume(struct inode *inode, u64 subvolume_id)
}
void ceph_fill_file_time(struct inode *inode, int issued,
- u64 time_warp_seq, struct timespec64 *ctime,
+ u32 time_warp_seq, struct timespec64 *ctime,
struct timespec64 *mtime, struct timespec64 *atime)
{
struct ceph_client *cl = ceph_inode_to_client(inode);
@@ -940,7 +940,7 @@ void ceph_fill_file_time(struct inode *inode, int issued,
ceph_seq_cmp(time_warp_seq, ci->i_time_warp_seq) > 0) {
/* the MDS did a utimes() */
doutc(cl, "mtime %ptSp -> %ptSp tw %d -> %d\n", &imtime, mtime,
- ci->i_time_warp_seq, (int)time_warp_seq);
+ ci->i_time_warp_seq, time_warp_seq);
inode_set_mtime_to_ts(inode, *mtime);
inode_set_atime_to_ts(inode, *atime);
@@ -972,7 +972,7 @@ void ceph_fill_file_time(struct inode *inode, int issued,
}
}
if (warn) /* time_warp_seq shouldn't go backwards */
- doutc(cl, "%p mds time_warp_seq %llu < %u\n", inode,
+ doutc(cl, "%p mds time_warp_seq %u < %u\n", inode,
time_warp_seq, ci->i_time_warp_seq);
}
diff --git a/fs/ceph/super.h b/fs/ceph/super.h
index 0d3363b0a33b..67411a5d8b91 100644
--- a/fs/ceph/super.h
+++ b/fs/ceph/super.h
@@ -268,7 +268,7 @@ struct ceph_cap_snap {
u64 size;
u64 change_attr;
struct timespec64 mtime, atime, ctime, btime;
- u64 time_warp_seq;
+ u32 time_warp_seq;
u64 truncate_size;
u32 truncate_seq;
bool writing; /* a sync write is still in progress */
@@ -1099,7 +1099,7 @@ extern int ceph_fill_file_size(struct inode *inode, int issued,
u32 truncate_seq, u64 truncate_size, u64 size);
extern void ceph_inode_set_subvolume(struct inode *inode, u64 subvolume_id);
extern void ceph_fill_file_time(struct inode *inode, int issued,
- u64 time_warp_seq, struct timespec64 *ctime,
+ u32 time_warp_seq, struct timespec64 *ctime,
struct timespec64 *mtime,
struct timespec64 *atime);
extern int ceph_fill_inode(struct inode *inode, struct page *locked_page,
--
2.47.3
next prev parent reply other threads:[~2026-07-06 7:25 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-06 7:24 [PATCH v2 00/18] fs/ceph: optimize struct layouts Max Kellermann
2026-07-06 7:24 ` [PATCH v2 01/18] fs/ceph/super: remove unused field `i_cap_migration_resv` Max Kellermann
2026-07-06 7:24 ` [PATCH v2 02/18] fs/ceph/super: make field `i_truncate_pagecache_size` optional Max Kellermann
2026-07-06 7:24 ` [PATCH v2 03/18] include/ceph/ceph_fs.h: convert `pool_id` to u32 Max Kellermann
2026-07-06 7:24 ` [PATCH v2 04/18] fs/ceph/super.h: convert ceph_inode_xattr fields to `bool` Max Kellermann
2026-07-06 7:24 ` [PATCH v2 05/18] fs/ceph/super.h: convert ceph_cap_snap.writing " Max Kellermann
2026-07-06 7:24 ` Max Kellermann [this message]
2026-07-06 7:24 ` [PATCH v2 07/18] fs/ceph/super: reorder fields to eliminate padding holes Max Kellermann
2026-07-06 7:24 ` [PATCH v2 08/18] fs/ceph: remove i_truncate_mutex, use i_fragtree_mutex for both Max Kellermann
2026-07-06 7:24 ` [PATCH v2 09/18] fs/ceph/super.h: add `const` to helpers Max Kellermann
2026-07-06 7:24 ` [PATCH v2 10/18] fs/ceph/super.h: add helper ceph_in_snap() Max Kellermann
2026-07-06 7:24 ` [PATCH v2 11/18] fs/ceph: use ceph_vino() etc. instead of accessing i_vino directly Max Kellermann
2026-07-06 7:24 ` [PATCH v2 12/18] fs/ceph: remove redundant inode number from ceph_inode_info Max Kellermann
2026-07-06 7:24 ` [PATCH v2 13/18] fs/ceph: remove unused field `ceph_cap.last_used` Max Kellermann
2026-07-06 7:24 ` [PATCH v2 14/18] fs/ceph: convert ceph_cap.queue_release to bool Max Kellermann
2026-07-06 7:24 ` [PATCH v2 15/18] fs/ceph/super: move `ceph_cap.caps_item` into the union Max Kellermann
2026-07-06 7:24 ` [PATCH v2 16/18] fs/ceph/snap: add a kmem_cache for struct ceph_snap_realm Max Kellermann
2026-07-06 7:24 ` [PATCH v2 17/18] fs/ceph/super: reorder struct ceph_snap_realm fields Max Kellermann
2026-07-06 7:24 ` [PATCH v2 18/18] fs/ceph/super: remove redundant field `ceph_snap_realm.parent_ino` Max Kellermann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260706072450.3920010-7-max.kellermann@ionos.com \
--to=max.kellermann@ionos.com \
--cc=amarkuze@redhat.com \
--cc=ceph-devel@vger.kernel.org \
--cc=idryomov@gmail.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox