From: Allison Collins <allison.henderson@oracle.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>,
david@fromorbit.com, hch@infradead.org
Cc: Amir Goldstein <amir73il@gmail.com>,
linux-xfs@vger.kernel.org, sandeen@sandeen.net
Subject: Re: [PATCH 04/11] xfs: refactor quota timestamp coding
Date: Thu, 27 Aug 2020 21:08:29 -0700 [thread overview]
Message-ID: <79517cd3-8113-cdfd-a47f-dbe5e657cd38@oracle.com> (raw)
In-Reply-To: <159847952392.2601708.833795605203708912.stgit@magnolia>
On 8/26/20 3:05 PM, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> Refactor quota timestamp encoding and decoding into helper functions so
> that we can add extra behavior in the next patch.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Looks fine
Reviewed-by: Allison Collins <allison.henderson@oracle.com>
> ---
> fs/xfs/libxfs/xfs_dquot_buf.c | 18 ++++++++++++++++++
> fs/xfs/libxfs/xfs_quota_defs.h | 5 +++++
> fs/xfs/xfs_dquot.c | 12 ++++++------
> 3 files changed, 29 insertions(+), 6 deletions(-)
>
>
> diff --git a/fs/xfs/libxfs/xfs_dquot_buf.c b/fs/xfs/libxfs/xfs_dquot_buf.c
> index 5a2db00b9d5f..cf85bad8a894 100644
> --- a/fs/xfs/libxfs/xfs_dquot_buf.c
> +++ b/fs/xfs/libxfs/xfs_dquot_buf.c
> @@ -288,3 +288,21 @@ const struct xfs_buf_ops xfs_dquot_buf_ra_ops = {
> .verify_read = xfs_dquot_buf_readahead_verify,
> .verify_write = xfs_dquot_buf_write_verify,
> };
> +
> +/* Convert an on-disk timer value into an incore timer value. */
> +time64_t
> +xfs_dquot_from_disk_ts(
> + struct xfs_disk_dquot *ddq,
> + __be32 dtimer)
> +{
> + return be32_to_cpu(dtimer);
> +}
> +
> +/* Convert an incore timer value into an on-disk timer value. */
> +__be32
> +xfs_dquot_to_disk_ts(
> + struct xfs_dquot *dqp,
> + time64_t timer)
> +{
> + return cpu_to_be32(timer);
> +}
> diff --git a/fs/xfs/libxfs/xfs_quota_defs.h b/fs/xfs/libxfs/xfs_quota_defs.h
> index 076bdc7037ee..9a99910d857e 100644
> --- a/fs/xfs/libxfs/xfs_quota_defs.h
> +++ b/fs/xfs/libxfs/xfs_quota_defs.h
> @@ -143,4 +143,9 @@ extern int xfs_calc_dquots_per_chunk(unsigned int nbblks);
> extern void xfs_dqblk_repair(struct xfs_mount *mp, struct xfs_dqblk *dqb,
> xfs_dqid_t id, xfs_dqtype_t type);
>
> +struct xfs_dquot;
> +time64_t xfs_dquot_from_disk_ts(struct xfs_disk_dquot *ddq,
> + __be32 dtimer);
> +__be32 xfs_dquot_to_disk_ts(struct xfs_dquot *ddq, time64_t timer);
> +
> #endif /* __XFS_QUOTA_H__ */
> diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c
> index e63a933413a3..59c03e973741 100644
> --- a/fs/xfs/xfs_dquot.c
> +++ b/fs/xfs/xfs_dquot.c
> @@ -536,9 +536,9 @@ xfs_dquot_from_disk(
> dqp->q_ino.warnings = be16_to_cpu(ddqp->d_iwarns);
> dqp->q_rtb.warnings = be16_to_cpu(ddqp->d_rtbwarns);
>
> - dqp->q_blk.timer = be32_to_cpu(ddqp->d_btimer);
> - dqp->q_ino.timer = be32_to_cpu(ddqp->d_itimer);
> - dqp->q_rtb.timer = be32_to_cpu(ddqp->d_rtbtimer);
> + dqp->q_blk.timer = xfs_dquot_from_disk_ts(ddqp, ddqp->d_btimer);
> + dqp->q_ino.timer = xfs_dquot_from_disk_ts(ddqp, ddqp->d_itimer);
> + dqp->q_rtb.timer = xfs_dquot_from_disk_ts(ddqp, ddqp->d_rtbtimer);
>
> /*
> * Reservation counters are defined as reservation plus current usage
> @@ -581,9 +581,9 @@ xfs_dquot_to_disk(
> ddqp->d_iwarns = cpu_to_be16(dqp->q_ino.warnings);
> ddqp->d_rtbwarns = cpu_to_be16(dqp->q_rtb.warnings);
>
> - ddqp->d_btimer = cpu_to_be32(dqp->q_blk.timer);
> - ddqp->d_itimer = cpu_to_be32(dqp->q_ino.timer);
> - ddqp->d_rtbtimer = cpu_to_be32(dqp->q_rtb.timer);
> + ddqp->d_btimer = xfs_dquot_to_disk_ts(dqp, dqp->q_blk.timer);
> + ddqp->d_itimer = xfs_dquot_to_disk_ts(dqp, dqp->q_ino.timer);
> + ddqp->d_rtbtimer = xfs_dquot_to_disk_ts(dqp, dqp->q_rtb.timer);
> }
>
> /* Allocate and initialize the dquot buffer for this in-core dquot. */
>
next prev parent reply other threads:[~2020-08-28 4:08 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-26 22:04 [PATCH v4 00/11] xfs: widen timestamps to deal with y2038 Darrick J. Wong
2020-08-26 22:05 ` [PATCH 01/11] xfs: explicitly define inode timestamp range Darrick J. Wong
2020-08-27 6:42 ` Christoph Hellwig
2020-08-28 4:08 ` Allison Collins
2020-08-26 22:05 ` [PATCH 02/11] xfs: refactor quota expiration timer modification Darrick J. Wong
2020-08-27 6:43 ` Christoph Hellwig
2020-08-28 4:08 ` Allison Collins
2020-08-26 22:05 ` [PATCH 03/11] xfs: refactor default quota grace period setting code Darrick J. Wong
2020-08-27 6:44 ` Christoph Hellwig
2020-08-28 4:08 ` Allison Collins
2020-08-26 22:05 ` [PATCH 04/11] xfs: refactor quota timestamp coding Darrick J. Wong
2020-08-27 6:44 ` Christoph Hellwig
2020-08-28 4:08 ` Allison Collins [this message]
2020-08-26 22:05 ` [PATCH 05/11] xfs: move xfs_log_dinode_to_disk to the log recovery code Darrick J. Wong
2020-08-27 6:45 ` Christoph Hellwig
2020-08-28 4:08 ` Allison Collins
2020-08-26 22:05 ` [PATCH 06/11] xfs: kill struct xfs_timestamp Darrick J. Wong
2020-08-28 4:08 ` Allison Collins
2020-08-26 22:05 ` [PATCH 07/11] xfs: kill struct xfs_ictimestamp Darrick J. Wong
2020-08-27 6:51 ` Christoph Hellwig
2020-08-27 8:17 ` Amir Goldstein
2020-08-27 8:18 ` Christoph Hellwig
2020-08-27 8:56 ` Amir Goldstein
2020-08-27 15:31 ` Darrick J. Wong
2020-08-26 22:05 ` [PATCH 08/11] xfs: widen ondisk inode timestamps to deal with y2038+ Darrick J. Wong
2020-08-27 6:58 ` Christoph Hellwig
2020-08-27 15:38 ` Darrick J. Wong
2020-08-26 22:05 ` [PATCH 09/11] xfs: widen ondisk quota expiration timestamps to handle y2038+ Darrick J. Wong
2020-08-27 7:00 ` Christoph Hellwig
2020-08-27 17:49 ` Darrick J. Wong
2020-08-28 6:08 ` Allison Collins
2020-08-26 22:06 ` [PATCH 10/11] xfs: trace timestamp limits Darrick J. Wong
2020-08-27 7:01 ` Christoph Hellwig
2020-08-28 6:08 ` Allison Collins
2020-08-26 22:06 ` [PATCH 11/11] xfs: enable big timestamps Darrick J. Wong
2020-08-28 6:09 ` Allison Collins
2020-08-27 6:41 ` [PATCH v4 00/11] xfs: widen timestamps to deal with y2038 Christoph Hellwig
2020-08-31 6:06 [PATCH v5 " Darrick J. Wong
2020-08-31 6:07 ` [PATCH 04/11] xfs: refactor quota timestamp coding Darrick J. Wong
2020-09-02 2:56 [PATCH v6 00/11] xfs: widen timestamps to deal with y2038 Darrick J. Wong
2020-09-02 2:56 ` [PATCH 04/11] xfs: refactor quota timestamp coding 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=79517cd3-8113-cdfd-a47f-dbe5e657cd38@oracle.com \
--to=allison.henderson@oracle.com \
--cc=amir73il@gmail.com \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--cc=hch@infradead.org \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@sandeen.net \
/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).