From: Deepa Dinamani <deepa.kernel@gmail.com>
To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: arnd@arndb.de, tglx@linutronix.de, torvalds@linux-foundation.org,
tytso@mit.edu, viro@zeniv.linux.org.uk, y2038@lists.linaro.org,
Mark Fasheh <mfasheh@suse.com>, Joel Becker <jlbec@evilplan.org>,
ocfs2-devel@oss.oracle.com
Subject: [PATCH v4 18/26] fs: ocfs2: Replace CURRENT_TIME macro
Date: Sat, 13 Aug 2016 15:48:30 -0700 [thread overview]
Message-ID: <1471128518-24075-19-git-send-email-deepa.kernel@gmail.com> (raw)
In-Reply-To: <1471128518-24075-1-git-send-email-deepa.kernel@gmail.com>
CURRENT_TIME is not y2038 safe.
Use y2038 safe ktime_get_real_seconds() here for timestamps.
struct heartbeat_block's hb_seq and deletetion time are already
64 bits wide and accommodate times beyond y2038.
Also use y2038 safe ktime_get_real_ts64() for on disk inode
timestamps.
These are also wide enough to accommodate time64_t.
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: ocfs2-devel@oss.oracle.com
---
fs/ocfs2/cluster/heartbeat.c | 2 +-
fs/ocfs2/inode.c | 2 +-
fs/ocfs2/namei.c | 6 ++++--
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index 636abcb..9158c98 100644
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -741,7 +741,7 @@ static inline void o2hb_prepare_block(struct o2hb_region *reg,
hb_block = (struct o2hb_disk_heartbeat_block *)slot->ds_raw_block;
memset(hb_block, 0, reg->hr_block_bytes);
/* TODO: time stuff */
- cputime = CURRENT_TIME.tv_sec;
+ cputime = ktime_get_real_seconds();
if (!cputime)
cputime = 1;
diff --git a/fs/ocfs2/inode.c b/fs/ocfs2/inode.c
index c56a767..382401d 100644
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
@@ -703,7 +703,7 @@ static int ocfs2_remove_inode(struct inode *inode,
goto bail_commit;
}
- di->i_dtime = cpu_to_le64(CURRENT_TIME.tv_sec);
+ di->i_dtime = cpu_to_le64(ktime_get_real_seconds());
di->i_flags &= cpu_to_le32(~(OCFS2_VALID_FL | OCFS2_ORPHANED_FL));
ocfs2_journal_dirty(handle, di_bh);
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c
index e2747d8..6a7bf9a 100644
--- a/fs/ocfs2/namei.c
+++ b/fs/ocfs2/namei.c
@@ -516,6 +516,7 @@ static int __ocfs2_mknod_locked(struct inode *dir,
struct ocfs2_extent_list *fel;
u16 feat;
struct ocfs2_inode_info *oi = OCFS2_I(inode);
+ struct timespec64 ts;
*new_fe_bh = NULL;
@@ -564,10 +565,11 @@ static int __ocfs2_mknod_locked(struct inode *dir,
fe->i_last_eb_blk = 0;
strcpy(fe->i_signature, OCFS2_INODE_SIGNATURE);
fe->i_flags |= cpu_to_le32(OCFS2_VALID_FL);
+ ktime_get_real_ts64(&ts);
fe->i_atime = fe->i_ctime = fe->i_mtime =
- cpu_to_le64(CURRENT_TIME.tv_sec);
+ cpu_to_le64(ts.tv_sec);
fe->i_mtime_nsec = fe->i_ctime_nsec = fe->i_atime_nsec =
- cpu_to_le32(CURRENT_TIME.tv_nsec);
+ cpu_to_le32(ts.tv_nsec);
fe->i_dtime = 0;
/*
--
1.9.1
next prev parent reply other threads:[~2016-08-14 10:51 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-13 22:48 [GIT PULL] [PATCH v4 00/26] Delete CURRENT_TIME and CURRENT_TIME_SEC macros Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 01/26] vfs: Add current_time() api Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 02/26] fs: proc: Delete inode time initializations in proc_alloc_inode() Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 03/26] fs: Replace CURRENT_TIME with current_time() for inode timestamps Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 04/26] fs: Replace CURRENT_TIME_SEC " Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 05/26] fs: Replace current_fs_time() with current_time() Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 06/26] fs: ufs: Use ktime_get_real_ts64() for birthtime Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 07/26] fs: jfs: Replace CURRENT_TIME_SEC by current_time() Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 08/26] fs: ext4: Use current_time() for inode timestamps Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 09/26] fs: ubifs: Replace CURRENT_TIME_SEC with current_time Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 10/26] fs: btrfs: Use ktime_get_real_ts for root ctime Deepa Dinamani
2016-08-15 13:26 ` David Sterba
2016-08-13 22:48 ` [PATCH v4 11/26] fs: udf: Replace CURRENT_TIME with current_time() Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 12/26] fs: cifs: Replace CURRENT_TIME by current_time() Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 13/26] fs: cifs: Replace CURRENT_TIME with ktime_get_real_ts() Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 14/26] fs: cifs: Replace CURRENT_TIME by get_seconds Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 15/26] fs: f2fs: Use ktime_get_real_seconds for sit_info times Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 16/26] drivers: staging: lustre: Replace CURRENT_TIME with current_time() Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 17/26] fs: ocfs2: Use time64_t to represent orphan scan times Deepa Dinamani
2016-08-13 22:48 ` Deepa Dinamani [this message]
2016-08-13 22:48 ` [PATCH v4 19/26] audit: Use timespec64 to represent audit timestamps Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 20/26] fs: nfs: Make nfs boot time y2038 safe Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 21/26] block: Replace CURRENT_TIME with ktime_get_real_ts Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 22/26] libceph: " Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 23/26] fs: ceph: Replace current_fs_time for request stamp Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 24/26] fnic: Use time64_t to represent trace timestamps Deepa Dinamani
2016-08-13 22:48 ` [PATCH v4 25/26] time: Delete current_fs_time() function Deepa Dinamani
2016-08-17 20:02 ` John Stultz
2016-08-13 22:48 ` [PATCH v4 26/26] time: Delete CURRENT_TIME_SEC and CURRENT_TIME Deepa Dinamani
2016-08-15 16:23 ` [GIT PULL] [PATCH v4 00/26] Delete CURRENT_TIME and CURRENT_TIME_SEC macros Greg KH
2016-08-16 18:18 ` Deepa Dinamani
2016-08-16 18:53 ` Greg KH
2016-08-23 14:51 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1471128518-24075-19-git-send-email-deepa.kernel@gmail.com \
--to=deepa.kernel@gmail.com \
--cc=arnd@arndb.de \
--cc=jlbec@evilplan.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mfasheh@suse.com \
--cc=ocfs2-devel@oss.oracle.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
--cc=y2038@lists.linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).