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 v2 16/24] fs: ocfs2: Replace CURRENT_TIME with ktime_get_real_seconds()
Date: Sun, 19 Jun 2016 17:27:15 -0700 [thread overview]
Message-ID: <1466382443-11063-17-git-send-email-deepa.kernel@gmail.com> (raw)
In-Reply-To: <1466382443-11063-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.
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
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 +-
2 files changed, 2 insertions(+), 2 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);
--
1.9.1
next prev parent reply other threads:[~2016-06-20 0:42 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-20 0:26 [PATCH v2 00/24] Delete CURRENT_TIME and CURRENT_TIME_SEC macros Deepa Dinamani
2016-06-20 0:27 ` [PATCH v2 01/24] vfs: Add current_time() api Deepa Dinamani
2016-06-20 0:27 ` [PATCH v2 02/24] fs: Replace CURRENT_TIME with current_time() for inode timestamps Deepa Dinamani
2016-06-20 0:27 ` [PATCH v2 03/24] fs: Replace CURRENT_TIME_SEC " Deepa Dinamani
2016-06-20 0:27 ` [PATCH v2 04/24] fs: Replace current_fs_time() with current_time() Deepa Dinamani
2016-06-20 0:27 ` [PATCH v2 05/24] fs: jfs: Replace CURRENT_TIME_SEC by current_time() Deepa Dinamani
2016-06-20 18:04 ` [Jfs-discussion] " Dave Kleikamp
2016-06-20 0:27 ` [PATCH v2 06/24] fs: ext4: Use current_time() for inode timestamps Deepa Dinamani
2016-06-22 13:40 ` Arnd Bergmann
2016-06-24 23:08 ` Deepa Dinamani
2016-06-20 0:27 ` [PATCH v2 07/24] fs: ubifs: Replace CURRENT_TIME_SEC with current_time Deepa Dinamani
2016-06-22 13:47 ` Arnd Bergmann
2016-06-24 21:05 ` Deepa Dinamani
2016-06-24 21:14 ` [Y2038] " Arnd Bergmann
2016-06-20 0:27 ` [PATCH v2 08/24] fs: btrfs: Use ktime_get_real_ts for root ctime Deepa Dinamani
2016-06-20 9:46 ` David Sterba
2016-06-20 0:27 ` [PATCH v2 09/24] fs: udf: Replace CURRENT_TIME with current_time() Deepa Dinamani
2016-06-22 13:54 ` [Y2038] " Arnd Bergmann
2016-06-23 1:59 ` Deepa Dinamani
2016-06-20 0:27 ` [PATCH v2 10/24] fs: cifs: Replace CURRENT_TIME by current_time() Deepa Dinamani
2016-06-20 0:27 ` [PATCH v2 11/24] fs: cifs: Replace CURRENT_TIME with ktime_get_real_ts() Deepa Dinamani
2016-06-20 0:27 ` [PATCH v2 12/24] fs: cifs: Replace CURRENT_TIME by get_seconds Deepa Dinamani
2016-06-20 0:27 ` [PATCH v2 13/24] fs: f2fs: Use ktime_get_real_seconds for sit_info times Deepa Dinamani
2016-06-20 0:27 ` [PATCH v2 14/24] drivers: staging: lustre: Replace CURRENT_TIME with current_time() Deepa Dinamani
2016-06-20 0:27 ` [PATCH v2 15/24] fs: ocfs2: Use time64_t to represent orphan scan times Deepa Dinamani
2016-06-20 0:27 ` Deepa Dinamani [this message]
2016-06-20 0:27 ` [PATCH v2 17/24] audit: Use timespec64 to represent audit timestamps Deepa Dinamani
2016-06-20 15:16 ` Richard Guy Briggs
2016-06-20 0:27 ` [PATCH v2 18/24] fs: nfs: Make nfs boot time y2038 safe Deepa Dinamani
2016-06-20 0:27 ` [PATCH v2 19/24] fnic: Use time64_t to represent trace timestamps Deepa Dinamani
2016-06-22 14:09 ` Arnd Bergmann
2016-06-23 1:51 ` Deepa Dinamani
2016-06-20 0:27 ` [PATCH v2 20/24] block: Replace CURRENT_TIME with ktime_get_real_ts Deepa Dinamani
2016-06-20 0:27 ` [PATCH v2 21/24] libceph: " Deepa Dinamani
2016-06-20 0:27 ` [PATCH v2 22/24] fs: ceph: Replace current_fs_time for request stamp Deepa Dinamani
2016-06-20 0:27 ` [PATCH v2 23/24] time: Delete CURRENT_TIME_SEC and CURRENT_TIME macro Deepa Dinamani
2016-06-22 15:44 ` Arnd Bergmann
2016-06-20 0:27 ` [PATCH v2 24/24] time: Delete current_fs_time() function Deepa Dinamani
2016-06-20 18:03 ` [PATCH v2 00/24] Delete CURRENT_TIME and CURRENT_TIME_SEC macros Linus Torvalds
2016-06-20 18:58 ` Deepa Dinamani
2016-06-21 15:00 ` [Y2038] " Arnd Bergmann
2016-06-22 15:49 ` 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=1466382443-11063-17-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
Powered by JetHome