From mboxrd@z Thu Jan 1 00:00:00 1970 From: Deepa Dinamani Subject: [PATCH v4 3/5] ext4: Initialize timestamps limits Date: Fri, 24 Feb 2017 17:41:01 -0800 Message-ID: <1487986863-6005-4-git-send-email-deepa.kernel@gmail.com> References: <1487986863-6005-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: <1487986863-6005-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+CkNjOiAiVGhlb2RvcmUg VHMnbyIgPHR5dHNvQG1pdC5lZHU+CkNjOiBBbmRyZWFzIERpbGdlciA8YWRpbGdlci5rZXJuZWxA ZGlsZ2VyLmNhPgpDYzogbGludXgtZXh0NEB2Z2VyLmtlcm5lbC5vcmcKLS0tCiBmcy9leHQ0L2V4 dDQuaCAgfCA0ICsrKysKIGZzL2V4dDQvc3VwZXIuYyB8IDcgKysrKysrLQogMiBmaWxlcyBjaGFu Z2VkLCAxMCBpbnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvZnMvZXh0 NC9leHQ0LmggYi9mcy9leHQ0L2V4dDQuaAppbmRleCAyYmVmMGJkLi43YmFjMmNkIDEwMDY0NAot LS0gYS9mcy9leHQ0L2V4dDQuaAorKysgYi9mcy9leHQ0L2V4dDQuaApAQCAtMTYzOSw2ICsxNjM5 LDEwIEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBleHQ0X2NsZWFyX3N0YXRlX2ZsYWdzKHN0cnVjdCBl eHQ0X2lub2RlX2luZm8gKmVpKQogCiAjZGVmaW5lIEVYVDRfR09PRF9PTERfSU5PREVfU0laRSAx MjgKIAorI2RlZmluZSBFWFQ0X0VYVFJBX1RJTUVTVEFNUF9NQVgJKCgoczY0KTEgPDwgMzQpIC0g MSAgKyBTMzJfTUlOKQorI2RlZmluZSBFWFQ0X05PTl9FWFRSQV9USU1FU1RBTVBfTUFYCVkyMDM4 X0VYUElSWV9USU1FU1RBTVAKKyNkZWZpbmUgRVhUNF9USU1FU1RBTVBfTUlOCQlTMzJfTUlOCisK IC8qCiAgKiBGZWF0dXJlIHNldCBkZWZpbml0aW9ucwogICovCmRpZmYgLS1naXQgYS9mcy9leHQ0 L3N1cGVyLmMgYi9mcy9leHQ0L3N1cGVyLmMKaW5kZXggYTY3MzU1OC4uYTc3ZTExYyAxMDA2NDQK LS0tIGEvZnMvZXh0NC9zdXBlci5jCisrKyBiL2ZzL2V4dDQvc3VwZXIuYwpAQCAtMzY4OSw4ICsz Njg5LDEzIEBAIHN0YXRpYyBpbnQgZXh0NF9maWxsX3N1cGVyKHN0cnVjdCBzdXBlcl9ibG9jayAq c2IsIHZvaWQgKmRhdGEsIGludCBzaWxlbnQpCiAJCQkgICAgICAgc2JpLT5zX2lub2RlX3NpemUp OwogCQkJZ290byBmYWlsZWRfbW91bnQ7CiAJCX0KLQkJaWYgKHNiaS0+c19pbm9kZV9zaXplID4g RVhUNF9HT09EX09MRF9JTk9ERV9TSVpFKQorCQlpZiAoc2JpLT5zX2lub2RlX3NpemUgPiBFWFQ0 X0dPT0RfT0xEX0lOT0RFX1NJWkUpIHsKIAkJCXNiLT5zX3RpbWVfZ3JhbiA9IDEgPDwgKEVYVDRf RVBPQ0hfQklUUyAtIDIpOworCQkJc2ItPnNfdGltZV9tYXggPSBFWFQ0X0VYVFJBX1RJTUVTVEFN UF9NQVg7CisJCX0gZWxzZQorCQkJc2ItPnNfdGltZV9tYXggPSBFWFQ0X05PTl9FWFRSQV9USU1F U1RBTVBfTUFYOworCisJCXNiLT5zX3RpbWVfbWluID0gRVhUNF9USU1FU1RBTVBfTUlOOwogCX0K IAogCXNiaS0+c19kZXNjX3NpemUgPSBsZTE2X3RvX2NwdShlcy0+c19kZXNjX3NpemUpOwotLSAK Mi43LjQKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClky MDM4IG1haWxpbmcgbGlzdApZMjAzOEBsaXN0cy5saW5hcm8ub3JnCmh0dHBzOi8vbGlzdHMubGlu YXJvLm9yZy9tYWlsbWFuL2xpc3RpbmZvL3kyMDM4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 v4 3/5] ext4: Initialize timestamps limits Date: Fri, 24 Feb 2017 17:41:01 -0800 Message-Id: <1487986863-6005-4-git-send-email-deepa.kernel@gmail.com> In-Reply-To: <1487986863-6005-1-git-send-email-deepa.kernel@gmail.com> References: <1487986863-6005-1-git-send-email-deepa.kernel@gmail.com> Sender: linux-kernel-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 Cc: "Theodore Ts'o" Cc: Andreas Dilger 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 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