xfs: rename xfs_ictimestamp_t
PATCH 1/1 xfs: rename xfs_ictimestamp_t
Rename xfs_ictimestamp_t to xfs_log_timestamp_t as it is a type used for logging timestamps with no relationship to the in-core inode.
Signed-off-by Christoph Hellwig <[email protected]>
--- fs/xfs/libxfs/xfs_log_format.h | 10 +++++----- fs/xfs/xfs_inode_item.c | 4 ++-- fs/xfs/xfs_inode_item_recover.c | 2 +- fs/xfs/xfs_ondisk.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-)
fs/xfs/libxfs/xfs_log_format.h +5 -5
@@ -368,7 +368,7 @@ static inline int xfs_ilog_fdata(int w)* directly mirrors the xfs_dinode structure as it must contain all the same * information. */ -typedef uint64_t xfs_ictimestamp_t ; +typedef uint64_t xfs_log_timestamp_t ;/* Legacy timestamp encoding format. */ struct xfs_legacy_ictimestamp {
@@ -393,9 +393,9 @@ struct xfs_log_dinode {uint16_t di_projid_hi;/* higher part of owner's project id */ uint8_t di_pad[6 ];/* unused, zeroed space */ uint16_t di_flushiter;/* incremented on flush */ -xfs_ictimestamp_t di_atime;/* time last accessed */ -xfs_ictimestamp_t di_mtime;/* time last modified */ -xfs_ictimestamp_t di_ctime;/* time created/inode modified */ +xfs_log_timestamp_t di_atime;/* time last accessed */ +xfs_log_timestamp_t di_mtime;/* time last modified */ +xfs_log_timestamp_t di_ctime;/* time created/inode modified */ xfs_fsize_t di_size;/* number of bytes in file */ xfs_rfsblock_t di_nblocks;/* # of direct & btree blocks used */ xfs_extlen_t di_extsize;/* basic/minimum extent size for file */
@@ -420,7 +420,7 @@ struct xfs_log_dinode {uint8_t di_pad2[12 ];/* more padding for future expansion */ /* fields only written to during inode creation */ -xfs_ictimestamp_t di_crtime;/* time created */ +xfs_log_timestamp_t di_crtime;/* time created */ xfs_ino_t di_ino;/* inode number */ uuid_t di_uuid;/* UUID of the filesystem */
fs/xfs/xfs_inode_item.c +2 -2
@@ -299,13 +299,13 @@ xfs_inode_item_format_attr_fork(* Convert an incore timestamp to a log timestamp. Note that the log format * specifies host endian format! */ -static inline xfs_ictimestamp_t +static inline xfs_log_timestamp_t xfs_inode_to_log_dinode_ts (struct xfs_inode *ip,const struct timespec64 tv) {struct xfs_legacy_ictimestamp *lits; -xfs_ictimestamp_t its; +xfs_log_timestamp_t its;if (xfs_inode_has_bigtime (ip))return xfs_inode_encode_bigtime (tv);
fs/xfs/xfs_inode_item_recover.c +1 -1
@@ -125,7 +125,7 @@ static inline bool xfs_log_dinode_has_bigtime(const struct xfs_log_dinode *ld)static inline xfs_timestamp_t xfs_log_dinode_to_disk_ts (struct xfs_log_dinode *from, -const xfs_ictimestamp_t its) +const xfs_log_timestamp_t its) {struct xfs_legacy_timestamp *lts;struct xfs_legacy_ictimestamp *lits;
fs/xfs/xfs_ondisk.h +1 -1
@@ -126,7 +126,7 @@ xfs_check_ondisk_structs(void) XFS_CHECK_STRUCT_SIZE(struct xfs_extent_64, 16); XFS_CHECK_STRUCT_SIZE(struct xfs_log_dinode, 176); XFS_CHECK_STRUCT_SIZE(struct xfs_icreate_log, 28); -XFS_CHECK_STRUCT_SIZE (xfs_ictimestamp_t,8 ); +XFS_CHECK_STRUCT_SIZE (xfs_log_timestamp_t,8 ); XFS_CHECK_STRUCT_SIZE(struct xfs_legacy_ictimestamp, 8); XFS_CHECK_STRUCT_SIZE(struct xfs_inode_log_format_32, 52); XFS_CHECK_STRUCT_SIZE(struct xfs_inode_log_format, 56);
Signature · 1 line
2.30.1
Quoted 16 lines · Christoph Hellwig
Rename
xfs_ictimestamp_ttoxfs_log_timestamp_tas it is a type used for logging timestamps with no relationship to the in-core inode.Signed-off-by Christoph Hellwig <[email protected]>--- fs/xfs/libxfs/xfs_log_format.h | 10 +++++----- fs/xfs/xfs_inode_item.c | 4 ++-- fs/xfs/xfs_inode_item_recover.c | 2 +- fs/xfs/xfs_ondisk.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-)fs/xfs/libxfs/xfs_log_format.h +0
-0
fs/xfs/libxfs/xfs_log_format.h static inline int xfs_ilog_fdata(int w) · line 374
Quoted 8 lines
fs/xfs/libxfs/xfs_log_format.h +1
-1@@ -368,7 +368,7 @@ static inline int xfs_ilog_fdata(int w)* directly mirrors the xfs_dinode structure as it must contain all the same * information. */ -typedef uint64_t xfs_ictimestamp_t ; +typedef uint64_t xfs_log_timestamp_t ;/* Legacy timestamp encoding format. */ struct xfs_legacy_ictimestamp {
Shouldn't you ^^^^^^^^^^^^^^^^^^ convert this one too?
--D
Quoted 71 lines
fs/xfs/libxfs/xfs_log_format.h +4
-4@@ -393,9 +393,9 @@ struct xfs_log_dinode {uint16_t di_projid_hi;/* higher part of owner's project id */ uint8_t di_pad[6 ];/* unused, zeroed space */ uint16_t di_flushiter;/* incremented on flush */ -xfs_ictimestamp_t di_atime;/* time last accessed */ -xfs_ictimestamp_t di_mtime;/* time last modified */ -xfs_ictimestamp_t di_ctime;/* time created/inode modified */ +xfs_log_timestamp_t di_atime;/* time last accessed */ +xfs_log_timestamp_t di_mtime;/* time last modified */ +xfs_log_timestamp_t di_ctime;/* time created/inode modified */ xfs_fsize_t di_size;/* number of bytes in file */ xfs_rfsblock_t di_nblocks;/* # of direct & btree blocks used */ xfs_extlen_t di_extsize;/* basic/minimum extent size for file */ @@ -420,7 +420,7 @@ struct xfs_log_dinode {uint8_t di_pad2[12 ];/* more padding for future expansion */ /* fields only written to during inode creation */ -xfs_ictimestamp_t di_crtime;/* time created */ +xfs_log_timestamp_t di_crtime;/* time created */ xfs_ino_t di_ino;/* inode number */ uuid_t di_uuid;/* UUID of the filesystem */ fs/xfs/xfs_inode_item.c +2
-2@@ -299,13 +299,13 @@ xfs_inode_item_format_attr_fork(* Convert an incore timestamp to a log timestamp. Note that the log format * specifies host endian format! */ -static inline xfs_ictimestamp_t +static inline xfs_log_timestamp_t xfs_inode_to_log_dinode_ts (struct xfs_inode *ip,const struct timespec64 tv) {struct xfs_legacy_ictimestamp *lits; -xfs_ictimestamp_t its; +xfs_log_timestamp_t its;if (xfs_inode_has_bigtime (ip))return xfs_inode_encode_bigtime (tv);fs/xfs/xfs_inode_item_recover.c +1
-1@@ -125,7 +125,7 @@ static inline bool xfs_log_dinode_has_bigtime(const struct xfs_log_dinode *ld)static inline xfs_timestamp_t xfs_log_dinode_to_disk_ts (struct xfs_log_dinode *from, -const xfs_ictimestamp_t its) +const xfs_log_timestamp_t its) {struct xfs_legacy_timestamp *lts;struct xfs_legacy_ictimestamp *lits;fs/xfs/xfs_ondisk.h +1
-1@@ -126,7 +126,7 @@ xfs_check_ondisk_structs(void) XFS_CHECK_STRUCT_SIZE(struct xfs_extent_64, 16); XFS_CHECK_STRUCT_SIZE(struct xfs_log_dinode, 176); XFS_CHECK_STRUCT_SIZE(struct xfs_icreate_log, 28); -XFS_CHECK_STRUCT_SIZE (xfs_ictimestamp_t,8 ); +XFS_CHECK_STRUCT_SIZE (xfs_log_timestamp_t,8 ); XFS_CHECK_STRUCT_SIZE(struct xfs_legacy_ictimestamp, 8); XFS_CHECK_STRUCT_SIZE(struct xfs_inode_log_format_32, 52); XFS_CHECK_STRUCT_SIZE(struct xfs_inode_log_format, 56);Signature · 1 line
2.30.1
[PATCH 2/1] xfs: rename struct xfs_legacy_ictimestamp
Rename struct xfs_legacy_ictimestamp to struct xfs_log_legacy_timestamp as it is a type used for logging timestamps with no relationship to the in-core inode.
Signed-off-by Christoph Hellwig <[email protected]>
--- fs/xfs/libxfs/xfs_log_format.h | 2 +- fs/xfs/xfs_inode_item.c | 4 ++-- fs/xfs/xfs_inode_item_recover.c | 4 ++-- fs/xfs/xfs_ondisk.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-)
fs/xfs/libxfs/xfs_log_format.h +1 -1
@@ -371,7 +371,7 @@ static inline int xfs_ilog_fdata(int w)typedef uint64_t xfs_log_timestamp_t ;/* Legacy timestamp encoding format. */ -struct xfs_legacy_ictimestamp { +struct xfs_log_legacy_timestamp {int32_t t_sec;/* timestamp seconds */ int32_t t_nsec;/* timestamp nanoseconds */ };
fs/xfs/xfs_inode_item.c +2 -2
@@ -304,13 +304,13 @@ xfs_inode_to_log_dinode_ts(struct xfs_inode *ip, const struct timespec64 tv) { - struct xfs_legacy_ictimestamp *lits; + struct xfs_log_legacy_timestamp *lits;xfs_log_timestamp_t its;if (xfs_inode_has_bigtime (ip))return xfs_inode_encode_bigtime (tv); - lits = (struct xfs_legacy_ictimestamp *)&its; + lits = (struct xfs_log_legacy_timestamp *)&its; lits->t_sec = tv.tv_sec; lits->t_nsec = tv.tv_nsec;
fs/xfs/xfs_inode_item_recover.c +2 -2
@@ -128,14 +128,14 @@ xfs_log_dinode_to_disk_ts( const xfs_log_timestamp_t its) {struct xfs_legacy_timestamp *lts; -struct xfs_legacy_ictimestamp *lits; +struct xfs_log_legacy_timestamp *lits;xfs_timestamp_t ts;if (xfs_log_dinode_has_bigtime (from))return cpu_to_be64 (its); lts = (struct xfs_legacy_timestamp *)&ts; - lits = (struct xfs_legacy_ictimestamp *)&its; + lits = (struct xfs_log_legacy_timestamp *)&its; lts->t_sec =cpu_to_be32 (lits->t_sec); lts->t_nsec =cpu_to_be32 (lits->t_nsec);
fs/xfs/xfs_ondisk.h +1 -1
@@ -127,7 +127,7 @@ xfs_check_ondisk_structs(void) XFS_CHECK_STRUCT_SIZE(struct xfs_log_dinode, 176); XFS_CHECK_STRUCT_SIZE(struct xfs_icreate_log, 28);XFS_CHECK_STRUCT_SIZE (xfs_log_timestamp_t,8 ); - XFS_CHECK_STRUCT_SIZE(struct xfs_legacy_ictimestamp, 8); + XFS_CHECK_STRUCT_SIZE(struct xfs_log_legacy_timestamp, 8); XFS_CHECK_STRUCT_SIZE(struct xfs_inode_log_format_32, 52); XFS_CHECK_STRUCT_SIZE(struct xfs_inode_log_format, 56); XFS_CHECK_STRUCT_SIZE(struct xfs_qoff_logformat, 20);
Signature · 1 line
2.30.1