|
 |
f49185 |
From 27bb0efa5e615a9162f5bc3e228bdb7c337faa4c Mon Sep 17 00:00:00 2001
|
|
|
f49185 |
From: Christoph Hellwig <hch@lst.de>
|
|
|
f49185 |
Date: Wed, 30 Jun 2021 18:38:58 -0400
|
|
|
f49185 |
Subject: [PATCH] xfs: rename xfs_ictimestamp_t
|
|
|
f49185 |
|
|
|
f49185 |
Source kernel commit: 6fc277c7c935c7e1fdee23e82da988d9d3cb6bef
|
|
|
f49185 |
|
|
|
f49185 |
Rename xfs_ictimestamp_t to xfs_log_timestamp_t as it is a type used
|
|
|
f49185 |
for logging timestamps with no relationship to the in-core inode.
|
|
|
f49185 |
|
|
|
f49185 |
Signed-off-by: Christoph Hellwig <hch@lst.de>
|
|
|
f49185 |
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
|
|
|
f49185 |
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
|
|
|
f49185 |
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
|
|
|
f49185 |
---
|
|
|
f49185 |
|
|
|
f49185 |
diff --git a/libxfs/xfs_log_format.h b/libxfs/xfs_log_format.h
|
|
|
f49185 |
index 8dc0df0..85ac52c 100644
|
|
|
f49185 |
--- a/libxfs/xfs_log_format.h
|
|
|
f49185 |
+++ b/libxfs/xfs_log_format.h
|
|
|
f49185 |
@@ -368,7 +368,7 @@ static inline int xfs_ilog_fdata(int w)
|
|
|
f49185 |
* directly mirrors the xfs_dinode structure as it must contain all the same
|
|
|
f49185 |
* information.
|
|
|
f49185 |
*/
|
|
|
f49185 |
-typedef uint64_t xfs_ictimestamp_t;
|
|
|
f49185 |
+typedef uint64_t xfs_log_timestamp_t;
|
|
|
f49185 |
|
|
|
f49185 |
/* Legacy timestamp encoding format. */
|
|
|
f49185 |
struct xfs_legacy_ictimestamp {
|
|
|
f49185 |
@@ -393,9 +393,9 @@ struct xfs_log_dinode {
|
|
|
f49185 |
uint16_t di_projid_hi; /* higher part of owner's project id */
|
|
|
f49185 |
uint8_t di_pad[6]; /* unused, zeroed space */
|
|
|
f49185 |
uint16_t di_flushiter; /* incremented on flush */
|
|
|
f49185 |
- xfs_ictimestamp_t di_atime; /* time last accessed */
|
|
|
f49185 |
- xfs_ictimestamp_t di_mtime; /* time last modified */
|
|
|
f49185 |
- xfs_ictimestamp_t di_ctime; /* time created/inode modified */
|
|
|
f49185 |
+ xfs_log_timestamp_t di_atime; /* time last accessed */
|
|
|
f49185 |
+ xfs_log_timestamp_t di_mtime; /* time last modified */
|
|
|
f49185 |
+ xfs_log_timestamp_t di_ctime; /* time created/inode modified */
|
|
|
f49185 |
xfs_fsize_t di_size; /* number of bytes in file */
|
|
|
f49185 |
xfs_rfsblock_t di_nblocks; /* # of direct & btree blocks used */
|
|
|
f49185 |
xfs_extlen_t di_extsize; /* basic/minimum extent size for file */
|
|
|
f49185 |
@@ -420,7 +420,7 @@ struct xfs_log_dinode {
|
|
|
f49185 |
uint8_t di_pad2[12]; /* more padding for future expansion */
|
|
|
f49185 |
|
|
|
f49185 |
/* fields only written to during inode creation */
|
|
|
f49185 |
- xfs_ictimestamp_t di_crtime; /* time created */
|
|
|
f49185 |
+ xfs_log_timestamp_t di_crtime; /* time created */
|
|
|
f49185 |
xfs_ino_t di_ino; /* inode number */
|
|
|
f49185 |
uuid_t di_uuid; /* UUID of the filesystem */
|
|
|
f49185 |
|
|
|
f49185 |
diff --git a/logprint/log_misc.c b/logprint/log_misc.c
|
|
|
f49185 |
index 4fad82b..f4fd7a8 100644
|
|
|
f49185 |
--- a/logprint/log_misc.c
|
|
|
f49185 |
+++ b/logprint/log_misc.c
|
|
|
f49185 |
@@ -743,7 +743,7 @@ xlog_print_trans_icreate(
|
|
|
f49185 |
|
|
|
f49185 |
time64_t
|
|
|
f49185 |
xlog_extract_dinode_ts(
|
|
|
f49185 |
- const xfs_ictimestamp_t its)
|
|
|
f49185 |
+ const xfs_log_timestamp_t its)
|
|
|
f49185 |
{
|
|
|
f49185 |
struct xfs_legacy_ictimestamp *lits;
|
|
|
f49185 |
|
|
|
f49185 |
diff --git a/logprint/logprint.h b/logprint/logprint.h
|
|
|
f49185 |
index 0061d5a..fe3831d 100644
|
|
|
f49185 |
--- a/logprint/logprint.h
|
|
|
f49185 |
+++ b/logprint/logprint.h
|
|
|
f49185 |
@@ -18,7 +18,7 @@ extern int print_no_data;
|
|
|
f49185 |
extern int print_no_print;
|
|
|
f49185 |
|
|
|
f49185 |
/* exports */
|
|
|
f49185 |
-extern time64_t xlog_extract_dinode_ts(const xfs_ictimestamp_t);
|
|
|
f49185 |
+extern time64_t xlog_extract_dinode_ts(const xfs_log_timestamp_t);
|
|
|
f49185 |
extern void xlog_print_lseek(struct xlog *, int, xfs_daddr_t, int);
|
|
|
f49185 |
|
|
|
f49185 |
extern void xfs_log_copy(struct xlog *, int, char *);
|