1 files changed, 15 insertions, 2 deletions

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 27cd622676e7..3db5f17228b7 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -4039,8 +4039,21 @@ 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)
-                        sb->s_time_gran = 1 << (EXT4_EPOCH_BITS - 2);
+                /*
+                 * i_atime_extra is the last extra field available for [acm]times in
+                 * struct ext4_inode. Checking for that field should suffice to ensure
+                 * we have extra space for all three.
+                 */
+                if (sbi->s_inode_size >= offsetof(struct ext4_inode, i_atime_extra) +
+                        sizeof(((struct ext4_inode *)0)->i_atime_extra)) {
+                        sb->s_time_gran = 1;
+                        sb->s_time_max = EXT4_EXTRA_TIMESTAMP_MAX;
+                } else {
+                        sb->s_time_gran = NSEC_PER_SEC;
+                        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);