From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422660AbaE3UME (ORCPT ); Fri, 30 May 2014 16:12:04 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:55156 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934318AbaE3UKx (ORCPT ); Fri, 30 May 2014 16:10:53 -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 , reiserfs-devel@vger.kernel.org Subject: [RFC 26/32] reiserfs: convert to struct inode_time Date: Fri, 30 May 2014 22:01:50 +0200 Message-Id: <1401480116-1973111-27-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:1itDdWkfT+gHm6WnFx7WSmbBwzWucECMkchvl76b4En 9uwV+9Qod6qfKoH3BLilaIF8/vkFQ7oe1gPvi3nRxUs8KTDQkg XkBoOhkSFjOY8Mf7Kr3dQn3qhpnVfHY7q5F2k8TTYnI4kXlrDM rZtPkSp/MrjDwj7oNnduOm37Bee6Br2EOlxLIt7dHVz18ZLNVJ 8VIkpRFowxwh+3TgRfbm9wkXVJ+g2oFqEUmMvKAvj2o5qExcfM njAEWPRx/E1BsJevH93HW417CKCudKKi765pp6c8YkueTyaHi5 H4TYQVFDBrx+v7HrwKL0J4lWyCPGyZVqvbXx8LNJxv2Mt50wcc kkXb9m+ImJPqhdU9PrrR4etQ0H+w3x3B56Xe+a1OZ Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org reiserfs uses unsigned 32-bit seconds for inode timestamps, which will work for the next 92 years, but the VFS uses struct timespec for timestamps, which is only good until 2038 on 32-bit CPUs. This gets us one small step closer to lifting the VFS limit by using struct inode_time in reiserfs. Signed-off-by: Arnd Bergmann Cc: reiserfs-devel@vger.kernel.org --- fs/reiserfs/namei.c | 2 +- fs/reiserfs/xattr.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c index e825f8b..4b81c84 100644 --- a/fs/reiserfs/namei.c +++ b/fs/reiserfs/namei.c @@ -1215,7 +1215,7 @@ static int reiserfs_rename(struct inode *old_dir, struct dentry *old_dentry, int jbegin_count; umode_t old_inode_mode; unsigned long savelink = 1; - struct timespec ctime; + struct inode_time ctime; /* three balancings: (1) old name removal, (2) new name insertion and (3) maybe "save" link insertion diff --git a/fs/reiserfs/xattr.c b/fs/reiserfs/xattr.c index 5cdfbd6..13367ca 100644 --- a/fs/reiserfs/xattr.c +++ b/fs/reiserfs/xattr.c @@ -426,9 +426,9 @@ int reiserfs_commit_write(struct file *f, struct page *page, static void update_ctime(struct inode *inode) { - struct timespec now = current_fs_time(inode->i_sb); + struct inode_time now = current_fs_time(inode->i_sb); if (inode_unhashed(inode) || !inode->i_nlink || - timespec_equal(&inode->i_ctime, &now)) + inode_time_equal(&inode->i_ctime, &now)) return; inode->i_ctime = CURRENT_TIME_SEC; -- 1.8.3.2