From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: darrick.wong@oracle.com
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH 10/14] xfs: convert struct xfs_timestamp to union
Date: Tue, 31 Dec 2019 17:12:06 -0800 [thread overview]
Message-ID: <157784112596.1364230.11061695243014872367.stgit@magnolia> (raw)
In-Reply-To: <157784106066.1364230.569420432829402226.stgit@magnolia>
From: Darrick J. Wong <darrick.wong@oracle.com>
Convert the xfs_timestamp struct to a union so that we can overload it
in the next patch.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
fs/xfs/libxfs/xfs_format.h | 16 +++++++++-------
fs/xfs/libxfs/xfs_inode_buf.c | 4 ++--
fs/xfs/libxfs/xfs_inode_buf.h | 4 ++--
fs/xfs/libxfs/xfs_log_format.h | 16 +++++++++-------
fs/xfs/scrub/inode.c | 2 +-
fs/xfs/xfs_inode_item.c | 6 +++---
fs/xfs/xfs_ondisk.h | 4 ++--
7 files changed, 28 insertions(+), 24 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h
index b3ace144f6ce..8a1bb33ebdd5 100644
--- a/fs/xfs/libxfs/xfs_format.h
+++ b/fs/xfs/libxfs/xfs_format.h
@@ -848,9 +848,11 @@ typedef struct xfs_agfl {
* Inode timestamps consist of signed 32-bit counters for seconds and
* nanoseconds; time zero is the Unix epoch, Jan 1 00:00:00 UTC 1970.
*/
-struct xfs_timestamp {
- __be32 t_sec; /* timestamp seconds */
- __be32 t_nsec; /* timestamp nanoseconds */
+union xfs_timestamp {
+ struct {
+ __be32 t_sec; /* timestamp seconds */
+ __be32 t_nsec; /* timestamp nanoseconds */
+ };
};
/*
@@ -896,9 +898,9 @@ typedef struct xfs_dinode {
__be16 di_projid_hi; /* higher part owner's project id */
__u8 di_pad[6]; /* unused, zeroed space */
__be16 di_flushiter; /* incremented on flush */
- struct xfs_timestamp di_atime; /* time last accessed */
- struct xfs_timestamp di_mtime; /* time last modified */
- struct xfs_timestamp di_ctime; /* time created/inode modified */
+ union xfs_timestamp di_atime; /* time last accessed */
+ union xfs_timestamp di_mtime; /* time last modified */
+ union xfs_timestamp di_ctime; /* time created/inode modified */
__be64 di_size; /* number of bytes in file */
__be64 di_nblocks; /* # of direct & btree blocks used */
__be32 di_extsize; /* basic/minimum extent size for file */
@@ -923,7 +925,7 @@ typedef struct xfs_dinode {
__u8 di_pad2[12]; /* more padding for future expansion */
/* fields only written to during inode creation */
- struct xfs_timestamp di_crtime; /* time created */
+ union xfs_timestamp di_crtime; /* time created */
__be64 di_ino; /* inode number */
uuid_t di_uuid; /* UUID of the filesystem */
diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c
index 66f7895a9fee..f4725e4916ab 100644
--- a/fs/xfs/libxfs/xfs_inode_buf.c
+++ b/fs/xfs/libxfs/xfs_inode_buf.c
@@ -204,7 +204,7 @@ xfs_imap_to_bp(
void
xfs_inode_from_disk_timestamp(
struct timespec64 *tv,
- const struct xfs_timestamp *ts)
+ const union xfs_timestamp *ts)
{
tv->tv_sec = (int)be32_to_cpu(ts->t_sec);
tv->tv_nsec = (int)be32_to_cpu(ts->t_nsec);
@@ -273,7 +273,7 @@ xfs_inode_from_disk(
void
xfs_inode_to_disk_timestamp(
- struct xfs_timestamp *ts,
+ union xfs_timestamp *ts,
const struct timespec64 *tv)
{
ts->t_sec = cpu_to_be32(tv->tv_sec);
diff --git a/fs/xfs/libxfs/xfs_inode_buf.h b/fs/xfs/libxfs/xfs_inode_buf.h
index 8eca71ac0c5a..787a50df232f 100644
--- a/fs/xfs/libxfs/xfs_inode_buf.h
+++ b/fs/xfs/libxfs/xfs_inode_buf.h
@@ -76,8 +76,8 @@ xfs_failaddr_t xfs_inode_validate_cowextsize(struct xfs_mount *mp,
uint64_t flags2);
void xfs_inode_from_disk_timestamp(struct timespec64 *tv,
- const struct xfs_timestamp *ts);
-void xfs_inode_to_disk_timestamp(struct xfs_timestamp *ts,
+ const union xfs_timestamp *ts);
+void xfs_inode_to_disk_timestamp(union xfs_timestamp *ts,
const struct timespec64 *tv);
#endif /* __XFS_INODE_BUF_H__ */
diff --git a/fs/xfs/libxfs/xfs_log_format.h b/fs/xfs/libxfs/xfs_log_format.h
index 6694be6ddc3c..c98060115352 100644
--- a/fs/xfs/libxfs/xfs_log_format.h
+++ b/fs/xfs/libxfs/xfs_log_format.h
@@ -368,9 +368,11 @@ static inline int xfs_ilog_fdata(int w)
* directly mirrors the xfs_dinode structure as it must contain all the same
* information.
*/
-struct xfs_ictimestamp {
- int32_t t_sec; /* timestamp seconds */
- int32_t t_nsec; /* timestamp nanoseconds */
+union xfs_ictimestamp {
+ struct {
+ int32_t t_sec; /* timestamp seconds */
+ int32_t t_nsec; /* timestamp nanoseconds */
+ };
};
/*
@@ -390,9 +392,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 */
- struct xfs_ictimestamp di_atime; /* time last accessed */
- struct xfs_ictimestamp di_mtime; /* time last modified */
- struct xfs_ictimestamp di_ctime; /* time created/inode modified */
+ union xfs_ictimestamp di_atime; /* time last accessed */
+ union xfs_ictimestamp di_mtime; /* time last modified */
+ union xfs_ictimestamp 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 */
@@ -417,7 +419,7 @@ struct xfs_log_dinode {
uint8_t di_pad2[12]; /* more padding for future expansion */
/* fields only written to during inode creation */
- struct xfs_ictimestamp di_crtime; /* time created */
+ union xfs_ictimestamp di_crtime; /* time created */
xfs_ino_t di_ino; /* inode number */
uuid_t di_uuid; /* UUID of the filesystem */
diff --git a/fs/xfs/scrub/inode.c b/fs/xfs/scrub/inode.c
index ccb5c217c0ee..9f036053fdb7 100644
--- a/fs/xfs/scrub/inode.c
+++ b/fs/xfs/scrub/inode.c
@@ -199,7 +199,7 @@ static inline void
xchk_dinode_nsec(
struct xfs_scrub *sc,
xfs_ino_t ino,
- const struct xfs_timestamp *ts)
+ const union xfs_timestamp *ts)
{
struct timespec64 tv;
diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c
index 40131cefc165..a8d3c6aad1b8 100644
--- a/fs/xfs/xfs_inode_item.c
+++ b/fs/xfs/xfs_inode_item.c
@@ -297,8 +297,8 @@ xfs_inode_item_format_attr_fork(
static inline void
xfs_from_log_timestamp(
- struct xfs_timestamp *ts,
- const struct xfs_ictimestamp *its)
+ union xfs_timestamp *ts,
+ const union xfs_ictimestamp *its)
{
ts->t_sec = cpu_to_be32(its->t_sec);
ts->t_nsec = cpu_to_be32(its->t_nsec);
@@ -354,7 +354,7 @@ xfs_log_dinode_to_disk(
static inline void
xfs_to_log_timestamp(
- struct xfs_ictimestamp *its,
+ union xfs_ictimestamp *its,
const struct timespec64 *ts)
{
its->t_sec = ts->tv_sec;
diff --git a/fs/xfs/xfs_ondisk.h b/fs/xfs/xfs_ondisk.h
index b8811f927a3c..5a3372fb6e6d 100644
--- a/fs/xfs/xfs_ondisk.h
+++ b/fs/xfs/xfs_ondisk.h
@@ -53,7 +53,7 @@ xfs_check_ondisk_structs(void)
XFS_CHECK_STRUCT_SIZE(struct xfs_refcount_rec, 12);
XFS_CHECK_STRUCT_SIZE(struct xfs_rmap_key, 20);
XFS_CHECK_STRUCT_SIZE(struct xfs_rmap_rec, 24);
- XFS_CHECK_STRUCT_SIZE(struct xfs_timestamp, 8);
+ XFS_CHECK_STRUCT_SIZE(union xfs_timestamp, 8);
XFS_CHECK_STRUCT_SIZE(xfs_alloc_key_t, 8);
XFS_CHECK_STRUCT_SIZE(xfs_alloc_ptr_t, 4);
XFS_CHECK_STRUCT_SIZE(xfs_alloc_rec_t, 8);
@@ -132,7 +132,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(struct xfs_ictimestamp, 8);
+ XFS_CHECK_STRUCT_SIZE(union xfs_ictimestamp, 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);
next prev parent reply other threads:[~2020-01-01 1:12 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-01 1:11 [PATCH 00/14] xfs: widen timestamps to deal with y2038 Darrick J. Wong
2020-01-01 1:11 ` [PATCH 01/14] xfs: explicitly define inode timestamp range Darrick J. Wong
2020-02-12 23:00 ` Eric Sandeen
2020-02-13 1:26 ` Darrick J. Wong
2020-02-13 1:50 ` Eric Sandeen
2020-02-13 1:53 ` Darrick J. Wong
2020-01-01 1:11 ` [PATCH 02/14] xfs: preserve default grace interval during quotacheck Darrick J. Wong
2020-02-12 23:35 ` Eric Sandeen
2020-02-19 4:55 ` Eric Sandeen
2020-03-03 3:03 ` Eric Sandeen
2020-03-03 15:48 ` Darrick J. Wong
2020-03-03 15:52 ` Eric Sandeen
2020-01-01 1:11 ` [PATCH 03/14] xfs: refactor quota exceeded test Darrick J. Wong
2020-02-12 23:51 ` Eric Sandeen
2020-02-13 1:41 ` Darrick J. Wong
2020-02-13 1:52 ` Eric Sandeen
2020-02-13 1:59 ` Darrick J. Wong
2020-05-31 14:04 ` Amir Goldstein
2020-01-01 1:11 ` [PATCH 04/14] xfs: fix quota timer inactivation Darrick J. Wong
2020-05-31 15:04 ` Amir Goldstein
2020-06-01 23:56 ` Darrick J. Wong
2020-01-01 1:11 ` [PATCH 05/14] xfs: refactor quota expiration timer modification Darrick J. Wong
2020-02-12 23:57 ` Eric Sandeen
2020-02-13 1:46 ` Darrick J. Wong
2020-02-13 3:27 ` Eric Sandeen
2020-02-13 3:32 ` Eric Sandeen
2020-02-13 5:33 ` Darrick J. Wong
2020-01-01 1:11 ` [PATCH 06/14] xfs: refactor default quota grace period setting code Darrick J. Wong
2020-02-13 0:15 ` Eric Sandeen
2020-02-13 1:53 ` Darrick J. Wong
2020-02-13 2:03 ` Darrick J. Wong
2020-01-01 1:11 ` [PATCH 07/14] xfs: remove xfs_timestamp_t Darrick J. Wong
2020-01-01 1:11 ` [PATCH 08/14] xfs: move xfs_log_dinode_to_disk to the log code Darrick J. Wong
2020-01-01 1:11 ` [PATCH 09/14] xfs: refactor timestamp coding Darrick J. Wong
2020-01-01 1:12 ` Darrick J. Wong [this message]
2020-01-01 1:12 ` [PATCH 11/14] xfs: widen ondisk timestamps to deal with y2038 problem Darrick J. Wong
2020-05-31 12:30 ` Amir Goldstein
2020-06-01 23:17 ` Darrick J. Wong
2020-06-02 4:26 ` Amir Goldstein
2020-01-01 1:12 ` [PATCH 12/14] xfs: cache quota grace period expiration times incore Darrick J. Wong
2020-01-01 1:12 ` [PATCH 13/14] xfs: enable bigtime for quota timers Darrick J. Wong
2020-05-31 17:07 ` Amir Goldstein
2020-06-02 0:09 ` Darrick J. Wong
2020-06-02 4:04 ` Amir Goldstein
2020-01-01 1:12 ` [PATCH 14/14] xfs: enable big timestamps Darrick J. Wong
2020-05-26 9:20 ` [PATCH 00/14] xfs: widen timestamps to deal with y2038 Amir Goldstein
2020-05-26 15:57 ` Darrick J. Wong
2020-05-26 16:42 ` Amir Goldstein
2020-05-31 17:31 ` Amir Goldstein
2020-06-02 0:09 ` Darrick J. Wong
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=157784112596.1364230.11061695243014872367.stgit@magnolia \
--to=darrick.wong@oracle.com \
--cc=linux-xfs@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;
as well as URLs for NNTP newsgroup(s).