From mboxrd@z Thu Jan 1 00:00:00 1970 From: Deepa Dinamani Subject: [PATCH v3 3/5] ext4: Initialize timestamps limits Date: Sat, 18 Feb 2017 15:30:06 -0800 Message-ID: <1487460608-15697-4-git-send-email-deepa.kernel@gmail.com> References: <1487460608-15697-1-git-send-email-deepa.kernel@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Cc: linux-fsdevel@vger.kernel.org, y2038@lists.linaro.org, linux-kernel@vger.kernel.org, arnd@arndb.de To: viro@zeniv.linux.org.uk, tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org Return-path: In-Reply-To: <1487460608-15697-1-git-send-email-deepa.kernel@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: y2038-bounces@lists.linaro.org Sender: "Y2038" List-Id: linux-ext4.vger.kernel.org ZXh0NCBoYXMgZGlmZmVyZW50IG92ZXJmbG93IGxpbWl0cyBmb3IgbWF4IGZpbGVzeXN0ZW0KdGlt ZXN0YW1wcyBiYXNlZCBvbiB0aGUgZXh0cmEgYnl0ZXMgYXZhaWxhYmxlLgoKU2lnbmVkLW9mZi1i eTogRGVlcGEgRGluYW1hbmkgPGRlZXBhLmtlcm5lbEBnbWFpbC5jb20+Ci0tLQogZnMvZXh0NC9l eHQ0LmggIHwgNCArKysrCiBmcy9leHQ0L3N1cGVyLmMgfCA3ICsrKysrKy0KIDIgZmlsZXMgY2hh bmdlZCwgMTAgaW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL2ZzL2V4 dDQvZXh0NC5oIGIvZnMvZXh0NC9leHQ0LmgKaW5kZXggMmJlZjBiZC4uN2JhYzJjZCAxMDA2NDQK LS0tIGEvZnMvZXh0NC9leHQ0LmgKKysrIGIvZnMvZXh0NC9leHQ0LmgKQEAgLTE2MzksNiArMTYz OSwxMCBAQCBzdGF0aWMgaW5saW5lIHZvaWQgZXh0NF9jbGVhcl9zdGF0ZV9mbGFncyhzdHJ1Y3Qg ZXh0NF9pbm9kZV9pbmZvICplaSkKIAogI2RlZmluZSBFWFQ0X0dPT0RfT0xEX0lOT0RFX1NJWkUg MTI4CiAKKyNkZWZpbmUgRVhUNF9FWFRSQV9USU1FU1RBTVBfTUFYCSgoKHM2NCkxIDw8IDM0KSAt IDEgICsgUzMyX01JTikKKyNkZWZpbmUgRVhUNF9OT05fRVhUUkFfVElNRVNUQU1QX01BWAlZMjAz OF9FWFBJUllfVElNRVNUQU1QCisjZGVmaW5lIEVYVDRfVElNRVNUQU1QX01JTgkJUzMyX01JTgor CiAvKgogICogRmVhdHVyZSBzZXQgZGVmaW5pdGlvbnMKICAqLwpkaWZmIC0tZ2l0IGEvZnMvZXh0 NC9zdXBlci5jIGIvZnMvZXh0NC9zdXBlci5jCmluZGV4IGE2NzM1NTguLmE3N2UxMWMgMTAwNjQ0 Ci0tLSBhL2ZzL2V4dDQvc3VwZXIuYworKysgYi9mcy9leHQ0L3N1cGVyLmMKQEAgLTM2ODksOCAr MzY4OSwxMyBAQCBzdGF0aWMgaW50IGV4dDRfZmlsbF9zdXBlcihzdHJ1Y3Qgc3VwZXJfYmxvY2sg KnNiLCB2b2lkICpkYXRhLCBpbnQgc2lsZW50KQogCQkJICAgICAgIHNiaS0+c19pbm9kZV9zaXpl KTsKIAkJCWdvdG8gZmFpbGVkX21vdW50OwogCQl9Ci0JCWlmIChzYmktPnNfaW5vZGVfc2l6ZSA+ IEVYVDRfR09PRF9PTERfSU5PREVfU0laRSkKKwkJaWYgKHNiaS0+c19pbm9kZV9zaXplID4gRVhU NF9HT09EX09MRF9JTk9ERV9TSVpFKSB7CiAJCQlzYi0+c190aW1lX2dyYW4gPSAxIDw8IChFWFQ0 X0VQT0NIX0JJVFMgLSAyKTsKKwkJCXNiLT5zX3RpbWVfbWF4ID0gRVhUNF9FWFRSQV9USU1FU1RB TVBfTUFYOworCQl9IGVsc2UKKwkJCXNiLT5zX3RpbWVfbWF4ID0gRVhUNF9OT05fRVhUUkFfVElN RVNUQU1QX01BWDsKKworCQlzYi0+c190aW1lX21pbiA9IEVYVDRfVElNRVNUQU1QX01JTjsKIAl9 CiAKIAlzYmktPnNfZGVzY19zaXplID0gbGUxNl90b19jcHUoZXMtPnNfZGVzY19zaXplKTsKLS0g CjIuNy40CgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpZ MjAzOCBtYWlsaW5nIGxpc3QKWTIwMzhAbGlzdHMubGluYXJvLm9yZwpodHRwczovL2xpc3RzLmxp bmFyby5vcmcvbWFpbG1hbi9saXN0aW5mby95MjAzOAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f193.google.com ([209.85.192.193]:33704 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750820AbdBRXbJ (ORCPT ); Sat, 18 Feb 2017 18:31:09 -0500 From: Deepa Dinamani To: viro@zeniv.linux.org.uk, tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, arnd@arndb.de, y2038@lists.linaro.org Subject: [PATCH v3 3/5] ext4: Initialize timestamps limits Date: Sat, 18 Feb 2017 15:30:06 -0800 Message-Id: <1487460608-15697-4-git-send-email-deepa.kernel@gmail.com> In-Reply-To: <1487460608-15697-1-git-send-email-deepa.kernel@gmail.com> References: <1487460608-15697-1-git-send-email-deepa.kernel@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: ext4 has different overflow limits for max filesystem timestamps based on the extra bytes available. Signed-off-by: Deepa Dinamani --- 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 2bef0bd..7bac2cd 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -1639,6 +1639,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 a673558..a77e11c 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -3689,8 +3689,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