From: Jan Kara <jack@suse.cz>
To: Arnd Bergmann <arnd@arndb.de>
Cc: y2038@lists.linaro.org, linux-kernel@vger.kernel.org,
Jan Kara <jack@suse.com>
Subject: Re: [PATCH v2 09/24] quota: avoid time_t in v1_disk_dqblk definition
Date: Mon, 16 Dec 2019 14:14:19 +0100 [thread overview]
Message-ID: <20191216131419.GG22157@quack2.suse.cz> (raw)
In-Reply-To: <20191213205221.3787308-6-arnd@arndb.de>
On Fri 13-12-19 21:52:14, Arnd Bergmann wrote:
> The time_t type is part of the user interface and not always the
> same, with the move to 64-bit timestamps and the difference between
> architectures.
>
> Make the quota format definition independent of this type and use
> a basic type of the same length. Make it unsigned in the process
> to keep the v1 format working until year 2106 instead of 2038
> on 32-bit architectures.
>
> Hopefully, everybody has already moved to a newer format long
> ago (v2 was introduced with linux-2.4), but it's hard to be sure.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
What's worse, time_t is actually a part of on-disk format for this ancient
quota format making format incompatible between 32-bit and 64-bit
systems... Anyway, your patch looks good, I'll add it to my tree (speak up
if you want to merge it yourself due to something depending on it).
Honza
> ---
> fs/quota/quotaio_v1.h | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/fs/quota/quotaio_v1.h b/fs/quota/quotaio_v1.h
> index bd11e2c08119..31dca9a89176 100644
> --- a/fs/quota/quotaio_v1.h
> +++ b/fs/quota/quotaio_v1.h
> @@ -25,8 +25,10 @@ struct v1_disk_dqblk {
> __u32 dqb_ihardlimit; /* absolute limit on allocated inodes */
> __u32 dqb_isoftlimit; /* preferred inode limit */
> __u32 dqb_curinodes; /* current # allocated inodes */
> - time_t dqb_btime; /* time limit for excessive disk use */
> - time_t dqb_itime; /* time limit for excessive inode use */
> +
> + /* below fields differ in length on 32-bit vs 64-bit architectures */
> + unsigned long dqb_btime; /* time limit for excessive disk use */
> + unsigned long dqb_itime; /* time limit for excessive inode use */
> };
>
> #define v1_dqoff(UID) ((loff_t)((UID) * sizeof (struct v1_disk_dqblk)))
> --
> 2.20.0
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
next prev parent reply other threads:[~2019-12-16 13:14 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-13 20:49 [PATCH v2 00/24] drivers, fs: y2038 updates Arnd Bergmann
2019-12-13 20:49 ` [PATCH v2 01/24] Input: input_event: fix struct padding on sparc64 Arnd Bergmann
2019-12-13 22:08 ` Dmitry Torokhov
2019-12-13 20:49 ` [PATCH v2 02/24] fat: use prandom_u32() for i_generation Arnd Bergmann
2019-12-13 20:49 ` [PATCH v2 03/24] dlm: use SO_SNDTIMEO_NEW instead of SO_SNDTIMEO_OLD Arnd Bergmann
2019-12-13 20:52 ` [PATCH v2 04/24] xtensa: ISS: avoid struct timeval Arnd Bergmann
2019-12-13 20:52 ` [PATCH v2 05/24] um: ubd: use 64-bit time_t where possible Arnd Bergmann
2019-12-13 20:52 ` [PATCH v2 06/24] acct: stop using get_seconds() Arnd Bergmann
2019-12-13 20:52 ` [PATCH v2 07/24] tsacct: add 64-bit btime field Arnd Bergmann
2019-12-13 20:52 ` [PATCH v2 08/24] packet: clarify timestamp overflow Arnd Bergmann
2019-12-13 20:52 ` [PATCH v2 09/24] quota: avoid time_t in v1_disk_dqblk definition Arnd Bergmann
2019-12-16 13:14 ` Jan Kara [this message]
2019-12-13 20:53 ` [PATCH v2 10/24] hostfs: pass 64-bit timestamps to/from user space Arnd Bergmann
2019-12-13 20:53 ` [PATCH v2 11/24] hfs/hfsplus: use 64-bit inode timestamps Arnd Bergmann
2019-12-13 20:53 ` [PATCH v2 12/24] drm/msm: avoid using 'timespec' Arnd Bergmann
2019-12-13 20:53 ` [PATCH v2 13/24] drm/etnaviv: reject timeouts with tv_nsec >= NSEC_PER_SEC Arnd Bergmann
2020-01-08 1:16 ` [Y2038] " Ben Hutchings
2020-01-17 15:47 ` Guido Günther
2020-01-20 17:47 ` Lucas Stach
2020-01-20 18:47 ` Arnd Bergmann
2020-01-21 10:21 ` Lucas Stach
2020-01-21 11:46 ` Arnd Bergmann
2019-12-13 20:53 ` [PATCH v2 14/24] drm/etnaviv: avoid deprecated timespec Arnd Bergmann
2019-12-13 20:53 ` [PATCH v2 15/24] sunrpc: convert to time64_t for expiry Arnd Bergmann
2019-12-13 20:53 ` [PATCH v2 16/24] nfs: use time64_t internally Arnd Bergmann
2019-12-13 20:53 ` [PATCH v2 17/24] nfs: fix timstamp debug prints Arnd Bergmann
2019-12-13 20:53 ` [PATCH v2 18/24] nfs: fscache: use timespec64 in inode auxdata Arnd Bergmann
2019-12-13 20:53 ` [PATCH v2 19/24] xfs: rename compat_time_t to old_time32_t Arnd Bergmann
2019-12-13 21:18 ` Darrick J. Wong
2019-12-16 16:31 ` Arnd Bergmann
2019-12-13 20:53 ` [PATCH v2 20/24] xfs: disallow broken ioctls without compat-32-bit-time Arnd Bergmann
2019-12-13 21:05 ` Darrick J. Wong
2019-12-16 16:45 ` Arnd Bergmann
2019-12-16 16:52 ` Darrick J. Wong
2019-12-17 15:06 ` Arnd Bergmann
2019-12-13 20:53 ` [PATCH v2 21/24] xfs: quota: move to time64_t interfaces Arnd Bergmann
2019-12-13 21:17 ` Darrick J. Wong
2019-12-16 16:52 ` Arnd Bergmann
2019-12-17 15:02 ` Arnd Bergmann
2019-12-17 22:15 ` Darrick J. Wong
2019-12-18 16:44 ` Arnd Bergmann
2019-12-13 20:53 ` [PATCH v2 22/24] y2038: remove obsolete jiffies conversion functions Arnd Bergmann
2019-12-13 20:53 ` [PATCH v2 23/24] y2038: rename itimerval to __kernel_old_itimerval Arnd Bergmann
2019-12-13 20:53 ` [PATCH v2 24/24] y2038: sparc: remove use of struct timex Arnd Bergmann
2019-12-14 1:37 ` Julian Calaby
2019-12-14 14:44 ` [Y2038] " Arnd Bergmann
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=20191216131419.GG22157@quack2.suse.cz \
--to=jack@suse.cz \
--cc=arnd@arndb.de \
--cc=jack@suse.com \
--cc=linux-kernel@vger.kernel.org \
--cc=y2038@lists.linaro.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