From: Deepa Dinamani <deepa.kernel@gmail.com> To: viro@zeniv.linux.org.uk, tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org Cc: torvalds@linux-foundation.org, tglx@linutronix.de, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, arnd@arndb.de, y2038@lists.linaro.org Subject: [PATCH v5 3/5] ext4: Initialize timestamps limits Date: Sat, 8 Apr 2017 12:37:45 -0700 [thread overview] Message-ID: <1491680267-11171-4-git-send-email-deepa.kernel@gmail.com> (raw) In-Reply-To: <1491680267-11171-1-git-send-email-deepa.kernel@gmail.com> ext4 has different overflow limits for max filesystem timestamps based on the extra bytes available. Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com> Cc: "Theodore Ts'o" <tytso@mit.edu> Cc: Andreas Dilger <adilger.kernel@dilger.ca> Cc: linux-ext4@vger.kernel.org --- fs/ext4/ext4.h | 4 ++++ fs/ext4/super.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index fb69ee2..3292d4e 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -1640,6 +1640,10 @@ static inline void ext4_clear_state_flags(struct ext4_inode_info *ei) #define EXT4_GOOD_OLD_INODE_SIZE 128 +#define EXT4_EXTRA_TIMESTAMP_MAX (((s64)1 << 34) - 1 + S32_MIN) +#define EXT4_NON_EXTRA_TIMESTAMP_MAX Y2038_EXPIRY_TIMESTAMP +#define EXT4_TIMESTAMP_MIN S32_MIN + /* * Feature set definitions */ diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 73cae0c..0c1a864 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -3687,8 +3687,13 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) sbi->s_inode_size); goto failed_mount; } - if (sbi->s_inode_size > EXT4_GOOD_OLD_INODE_SIZE) + if (sbi->s_inode_size > EXT4_GOOD_OLD_INODE_SIZE) { sb->s_time_gran = 1 << (EXT4_EPOCH_BITS - 2); + sb->s_time_max = EXT4_EXTRA_TIMESTAMP_MAX; + } else + sb->s_time_max = EXT4_NON_EXTRA_TIMESTAMP_MAX; + + sb->s_time_min = EXT4_TIMESTAMP_MIN; } sbi->s_desc_size = le16_to_cpu(es->s_desc_size); -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Deepa Dinamani <deepa.kernel@gmail.com> To: viro@zeniv.linux.org.uk, tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org Cc: arnd@arndb.de, y2038@lists.linaro.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, tglx@linutronix.de, torvalds@linux-foundation.org Subject: [PATCH v5 3/5] ext4: Initialize timestamps limits Date: Sat, 8 Apr 2017 12:37:45 -0700 [thread overview] Message-ID: <1491680267-11171-4-git-send-email-deepa.kernel@gmail.com> (raw) In-Reply-To: <1491680267-11171-1-git-send-email-deepa.kernel@gmail.com> ext4 has different overflow limits for max filesystem timestamps based on the extra bytes available. Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com> Cc: "Theodore Ts'o" <tytso@mit.edu> Cc: Andreas Dilger <adilger.kernel@dilger.ca> Cc: linux-ext4@vger.kernel.org --- fs/ext4/ext4.h | 4 ++++ fs/ext4/super.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index fb69ee2..3292d4e 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -1640,6 +1640,10 @@ static inline void ext4_clear_state_flags(struct ext4_inode_info *ei) #define EXT4_GOOD_OLD_INODE_SIZE 128 +#define EXT4_EXTRA_TIMESTAMP_MAX (((s64)1 << 34) - 1 + S32_MIN) +#define EXT4_NON_EXTRA_TIMESTAMP_MAX Y2038_EXPIRY_TIMESTAMP +#define EXT4_TIMESTAMP_MIN S32_MIN + /* * Feature set definitions */ diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 73cae0c..0c1a864 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -3687,8 +3687,13 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) sbi->s_inode_size); goto failed_mount; } - if (sbi->s_inode_size > EXT4_GOOD_OLD_INODE_SIZE) + if (sbi->s_inode_size > EXT4_GOOD_OLD_INODE_SIZE) { sb->s_time_gran = 1 << (EXT4_EPOCH_BITS - 2); + sb->s_time_max = EXT4_EXTRA_TIMESTAMP_MAX; + } else + sb->s_time_max = EXT4_NON_EXTRA_TIMESTAMP_MAX; + + sb->s_time_min = EXT4_TIMESTAMP_MIN; } sbi->s_desc_size = le16_to_cpu(es->s_desc_size); -- 2.7.4 _______________________________________________ Y2038 mailing list Y2038@lists.linaro.org https://lists.linaro.org/mailman/listinfo/y2038
next prev parent reply other threads:[~2017-04-08 19:40 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-04-08 19:37 [PATCH v5 0/5] vfs: Add timestamp range check support Deepa Dinamani 2017-04-08 19:37 ` Deepa Dinamani 2017-04-08 19:37 ` [PATCH v5 1/5] vfs: Add file timestamp range support Deepa Dinamani 2017-04-08 19:37 ` Deepa Dinamani 2017-04-08 19:37 ` [PATCH v5 2/5] vfs: Add checks for filesystem timestamp limits Deepa Dinamani 2017-04-08 20:04 ` Linus Torvalds 2017-04-08 20:04 ` Linus Torvalds 2017-04-09 2:58 ` Deepa Dinamani 2017-04-25 19:47 ` Arnd Bergmann 2017-04-25 20:02 ` Linus Torvalds 2017-04-25 20:31 ` [Y2038] " Arnd Bergmann 2017-04-25 20:31 ` Arnd Bergmann 2017-04-25 20:35 ` [Y2038] " Linus Torvalds 2017-04-25 20:35 ` Linus Torvalds 2017-04-25 21:23 ` [Y2038] " Arnd Bergmann 2017-04-25 21:23 ` Arnd Bergmann 2017-04-08 19:37 ` Deepa Dinamani [this message] 2017-04-08 19:37 ` [PATCH v5 3/5] ext4: Initialize timestamps limits Deepa Dinamani 2017-04-08 19:37 ` [PATCH v5 4/5] vfs: Add timestamp_truncate() api Deepa Dinamani 2017-04-08 19:37 ` Deepa Dinamani 2017-04-08 19:37 ` [PATCH v5 5/5] utimes: Clamp the timestamps before update Deepa Dinamani 2017-04-08 19:37 ` Deepa Dinamani
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=1491680267-11171-4-git-send-email-deepa.kernel@gmail.com \ --to=deepa.kernel@gmail.com \ --cc=adilger.kernel@dilger.ca \ --cc=arnd@arndb.de \ --cc=linux-ext4@vger.kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=tglx@linutronix.de \ --cc=torvalds@linux-foundation.org \ --cc=tytso@mit.edu \ --cc=viro@zeniv.linux.org.uk \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.