From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422681AbaE3UMO (ORCPT ); Fri, 30 May 2014 16:12:14 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:64134 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422663AbaE3UML (ORCPT ); Fri, 30 May 2014 16:12:11 -0400 From: Arnd Bergmann To: linux-kernel@vger.kernel.org Cc: linux-arch@vger.kernel.org, joseph@codesourcery.com, john.stultz@linaro.org, hch@infradead.org, tglx@linutronix.de, geert@linux-m68k.org, lftan@altera.com, hpa@zytor.com, linux-fsdevel@vger.kernel.org, Arnd Bergmann Subject: [RFC 24/32] hfs, hfsplus: convert to struct inode_time Date: Fri, 30 May 2014 22:01:48 +0200 Message-Id: <1401480116-1973111-25-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1401480116-1973111-1-git-send-email-arnd@arndb.de> References: <1401480116-1973111-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:qGWMTh3iJcGQ8u8SvIGJyv3ir0XrCVGYo5eU1GP8kcw yD23BQ1s0HrIpH3rX9IiVugz3e4M3QS/Q48q8yJYTdrCEhcdf8 I9jf9mN6Wcd7+eGwhSRLkG3DgtNeKUg28iGyc1l8DdbaBjYY1m VycGr7QPRdAGdt2UjFDgg/pvDHchdjRY+JWPRuSzZOtnQB8tiS pXpY2Stg8dc9PukgzSRfvf3p3KYmQG4K8ezjITAHbubwb5IdOg +lwq3VO4BPVl9t4SkHleufulio3tYd0+t4fan9SVqRyCxN8lid ZF98xMqUU6l3t1guw3cCRSIIqZgQtHtiZCvyBXmEexut8iP++G qklPgNFVWUqcvzstyqSNr3CPLAXtFINejMjW3KTiX Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org hfs uses 32-bit integers based at 1904 for inode timestamps, which will only work until 2040, but the VFS uses struct timespec for timestamps, which expires even earlier in 2038 on 32-bit CPUs. This gets us one small step closer to lifting the VFS limit by using struct inode_time in logfs. Signed-off-by: Arnd Bergmann --- fs/hfs/hfs_fs.h | 2 +- fs/hfsplus/hfsplus_fs.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/hfs/hfs_fs.h b/fs/hfs/hfs_fs.h index 0524cda..1a449b6 100644 --- a/fs/hfs/hfs_fs.h +++ b/fs/hfs/hfs_fs.h @@ -257,7 +257,7 @@ extern struct timezone sys_tz; #define HFS_I(inode) (list_entry(inode, struct hfs_inode_info, vfs_inode)) #define HFS_SB(sb) ((struct hfs_sb_info *)(sb)->s_fs_info) -#define hfs_m_to_utime(time) (struct timespec){ .tv_sec = __hfs_m_to_utime(time) } +#define hfs_m_to_utime(time) (struct inode_time){ .tv_sec = __hfs_m_to_utime(time) } #define hfs_u_to_mtime(time) __hfs_u_to_mtime((time).tv_sec) #define hfs_mtime() __hfs_u_to_mtime(get_seconds()) diff --git a/fs/hfsplus/hfsplus_fs.h b/fs/hfsplus/hfsplus_fs.h index 8b35648..dd9e642 100644 --- a/fs/hfsplus/hfsplus_fs.h +++ b/fs/hfsplus/hfsplus_fs.h @@ -522,7 +522,7 @@ int hfsplus_submit_bio(struct super_block *sb, sector_t sector, #define __hfsp_ut2mt(t) (cpu_to_be32(t + 2082844800U)) /* compatibility */ -#define hfsp_mt2ut(t) (struct timespec){ .tv_sec = __hfsp_mt2ut(t) } +#define hfsp_mt2ut(t) (struct inode_time){ .tv_sec = __hfsp_mt2ut(t) } #define hfsp_ut2mt(t) __hfsp_ut2mt((t).tv_sec) #define hfsp_now2mt() __hfsp_ut2mt(get_seconds()) -- 1.8.3.2