From e7bf12844d7b1d9c3e86caf6dfb8dd0a49d99a03 Mon Sep 17 00:00:00 2001 From: Deepa Dinamani Date: Fri, 7 May 2021 15:00:58 +0800 Subject: [PATCH] ext4: Reduce ext4 timestamp warnings mainline inclusion from mainline-v5.4-rc1 commit cba465b4f9820b0d929822a70341dde14909fc18 category: bugfix bugzilla: 50526 CVE: NA ----------------------------------------------- When ext4 file systems were created intentionally with 128 byte inodes, the rate-limited warning of eventual possible timestamp overflow are still emitted rather frequently. Remove the warning for now. Discussion for whether any warning is needed, and where it should be emitted, can be found at https://lore.kernel.org/lkml/1567523922.5576.57.camel@lca.pw/. I can post a separate follow-up patch after the conclusion. Reported-by: Qian Cai Signed-off-by: Deepa Dinamani Reviewed-by: Andreas Dilger Signed-off-by: Arnd Bergmann Signed-off-by: Yu Kuai Reviewed-by: zhangyi (F) Signed-off-by: Yang Yingliang --- fs/ext4/ext4.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 46d7f5162de5..e220fa1360a0 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h @@ -851,10 +851,8 @@ do { \ (raw_inode)->xtime ## _extra = \ ext4_encode_extra_time(&(inode)->xtime); \ } \ - else {\ + else \ (raw_inode)->xtime = cpu_to_le32(clamp_t(int32_t, (inode)->xtime.tv_sec, S32_MIN, S32_MAX)); \ - ext4_warning_inode(inode, "inode does not support timestamps beyond 2038"); \ - } \ } while (0) #define EXT4_EINODE_SET_XTIME(xtime, einode, raw_inode) \ -- GitLab