From mboxrd@z Thu Jan 1 00:00:00 1970 From: Deepa Dinamani Subject: [PATCH v6 2/4] ext4: Initialize timestamps limits Date: Sun, 21 Jan 2018 18:04:24 -0800 Message-ID: <20180122020426.2988-3-deepa.kernel@gmail.com> References: <20180122020426.2988-1-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, torvalds@linux-foundation.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: <20180122020426.2988-1-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 NC9leHQ0LmggYi9mcy9leHQ0L2V4dDQuaAppbmRleCAzMjQxNDc1YTE3MzMuLmZlNGQ3YTE2ODY2 NCAxMDA2NDQKLS0tIGEvZnMvZXh0NC9leHQ0LmgKKysrIGIvZnMvZXh0NC9leHQ0LmgKQEAgLTE2 MDIsNiArMTYwMiwxMCBAQCBzdGF0aWMgaW5saW5lIHZvaWQgZXh0NF9jbGVhcl9zdGF0ZV9mbGFn cyhzdHJ1Y3QgZXh0NF9pbm9kZV9pbmZvICplaSkKIAogI2RlZmluZSBFWFQ0X0dPT0RfT0xEX0lO T0RFX1NJWkUgMTI4CiAKKyNkZWZpbmUgRVhUNF9FWFRSQV9USU1FU1RBTVBfTUFYCSgoKHM2NCkx IDw8IDM0KSAtIDEgICsgUzMyX01JTikKKyNkZWZpbmUgRVhUNF9OT05fRVhUUkFfVElNRVNUQU1Q X01BWAlTMzJfTUFYCisjZGVmaW5lIEVYVDRfVElNRVNUQU1QX01JTgkJUzMyX01JTgorCiAvKgog ICogRmVhdHVyZSBzZXQgZGVmaW5pdGlvbnMKICAqLwpkaWZmIC0tZ2l0IGEvZnMvZXh0NC9zdXBl ci5jIGIvZnMvZXh0NC9zdXBlci5jCmluZGV4IDA4NDNlYmZlYWNlMS4uN2MyYjIyN2FhMzE5IDEw MDY0NAotLS0gYS9mcy9leHQ0L3N1cGVyLmMKKysrIGIvZnMvZXh0NC9zdXBlci5jCkBAIC0zNzY4 LDggKzM3NjgsMTMgQEAgc3RhdGljIGludCBleHQ0X2ZpbGxfc3VwZXIoc3RydWN0IHN1cGVyX2Js b2NrICpzYiwgdm9pZCAqZGF0YSwgaW50IHNpbGVudCkKIAkJCSAgICAgICBzYmktPnNfaW5vZGVf c2l6ZSk7CiAJCQlnb3RvIGZhaWxlZF9tb3VudDsKIAkJfQotCQlpZiAoc2JpLT5zX2lub2RlX3Np emUgPiBFWFQ0X0dPT0RfT0xEX0lOT0RFX1NJWkUpCisJCWlmIChzYmktPnNfaW5vZGVfc2l6ZSA+ IEVYVDRfR09PRF9PTERfSU5PREVfU0laRSkgewogCQkJc2ItPnNfdGltZV9ncmFuID0gMSA8PCAo RVhUNF9FUE9DSF9CSVRTIC0gMik7CisJCQlzYi0+c190aW1lX21heCA9IEVYVDRfRVhUUkFfVElN RVNUQU1QX01BWDsKKwkJfSBlbHNlCisJCQlzYi0+c190aW1lX21heCA9IEVYVDRfTk9OX0VYVFJB X1RJTUVTVEFNUF9NQVg7CisKKwkJc2ItPnNfdGltZV9taW4gPSBFWFQ0X1RJTUVTVEFNUF9NSU47 CiAJfQogCiAJc2JpLT5zX2Rlc2Nfc2l6ZSA9IGxlMTZfdG9fY3B1KGVzLT5zX2Rlc2Nfc2l6ZSk7 Ci0tIAoyLjE0LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fClkyMDM4IG1haWxpbmcgbGlzdApZMjAzOEBsaXN0cy5saW5hcm8ub3JnCmh0dHBzOi8vbGlz dHMubGluYXJvLm9yZy9tYWlsbWFuL2xpc3RpbmZvL3kyMDM4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f196.google.com ([209.85.192.196]:45888 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751050AbeAVCFY (ORCPT ); Sun, 21 Jan 2018 21:05:24 -0500 From: Deepa Dinamani To: viro@zeniv.linux.org.uk, tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org Cc: torvalds@linux-foundation.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, arnd@arndb.de, y2038@lists.linaro.org Subject: [PATCH v6 2/4] ext4: Initialize timestamps limits Date: Sun, 21 Jan 2018 18:04:24 -0800 Message-Id: <20180122020426.2988-3-deepa.kernel@gmail.com> In-Reply-To: <20180122020426.2988-1-deepa.kernel@gmail.com> References: <20180122020426.2988-1-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 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 3241475a1733..fe4d7a168664 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -1602,6 +1602,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 S32_MAX +#define EXT4_TIMESTAMP_MIN S32_MIN + /* * Feature set definitions */ diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 0843ebfeace1..7c2b227aa319 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -3768,8 +3768,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.14.1