diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-12-13 21:52:14 +0100 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2019-12-16 14:15:30 +0100 |
| commit | 1ead083ae1472e5aaee7f18ea827b13f55bd10a6 (patch) | |
| tree | 51d718e65497863c62549881bef207e41bcee9a3 /fs | |
| parent | reiserfs: Fix spurious unlock in reiserfs_fill_super() error handling (diff) | |
| download | linux-1ead083ae1472e5aaee7f18ea827b13f55bd10a6.tar.xz linux-1ead083ae1472e5aaee7f18ea827b13f55bd10a6.zip | |
quota: avoid time_t in v1_disk_dqblk definition
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.
Link: https://lore.kernel.org/r/20191213205221.3787308-6-arnd@arndb.de
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/quota/quotaio_v1.h | 6 |
1 files 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))) |