Message-ID: <20230705185812.579118-2-jlayton@kernel.org>
Date: Wed,  5 Jul 2023 14:58:10 -0400
From: Jeff Layton <jlayton@...nel.org>
To: jk@...abs.org,
	arnd@...db.de,
	mpe@...erman.id.au,
	npiggin@...il.com,
	christophe.leroy@...roup.eu,
	hca@...ux.ibm.com,
	gor@...ux.ibm.com,
	agordeev@...ux.ibm.com,
	borntraeger@...ux.ibm.com,
	svens@...ux.ibm.com,
	gregkh@...uxfoundation.org,
	arve@...roid.com,
	tkjos@...roid.com,
	maco@...roid.com,
	joel@...lfernandes.org,
	brauner@...nel.org,
	cmllamas@...gle.com,
	surenb@...gle.com,
	dennis.dalessandro@...nelisnetworks.com,
	jgg@...pe.ca,
	leon@...nel.org,
	bwarrum@...ux.ibm.com,
	rituagar@...ux.ibm.com,
	ericvh@...nel.org,
	lucho@...kov.net,
	asmadeus@...ewreck.org,
	linux_oss@...debyte.com,
	dsterba@...e.com,
	dhowells@...hat.com,
	marc.dionne@...istor.com,
	viro@...iv.linux.org.uk,
	raven@...maw.net,
	luisbg@...nel.org,
	salah.triki@...il.com,
	aivazian.tigran@...il.com,
	ebiederm@...ssion.com,
	keescook@...omium.org,
	clm@...com,
	josef@...icpanda.com,
	xiubli@...hat.com,
	idryomov@...il.com,
	jlayton@...nel.org,
	jaharkes@...cmu.edu,
	coda@...cmu.edu,
	jlbec@...lplan.org,
	hch@....de,
	nico@...xnic.net,
	rafael@...nel.org,
	code@...icks.com,
	ardb@...nel.org,
	xiang@...nel.org,
	chao@...nel.org,
	huyue2@...lpad.com,
	jefflexu@...ux.alibaba.com,
	linkinjeon@...nel.org,
	sj1557.seo@...sung.com,
	jack@...e.com,
	tytso@....edu,
	adilger.kernel@...ger.ca,
	jaegeuk@...nel.org,
	hirofumi@...l.parknet.co.jp,
	miklos@...redi.hu,
	rpeterso@...hat.com,
	agruenba@...hat.com,
	richard@....at,
	anton.ivanov@...bridgegreys.com,
	johannes@...solutions.net,
	mikulas@...ax.karlin.mff.cuni.cz,
	mike.kravetz@...cle.com,
	muchun.song@...ux.dev,
	dwmw2@...radead.org,
	shaggy@...nel.org,
	tj@...nel.org,
	trond.myklebust@...merspace.com,
	anna@...nel.org,
	chuck.lever@...cle.com,
	neilb@...e.de,
	kolga@...app.com,
	Dai.Ngo@...cle.com,
	tom@...pey.com,
	konishi.ryusuke@...il.com,
	anton@...era.com,
	almaz.alexandrovich@...agon-software.com,
	mark@...heh.com,
	joseph.qi@...ux.alibaba.com,
	me@...copeland.com,
	hubcap@...ibond.com,
	martin@...ibond.com,
	amir73il@...il.com,
	mcgrof@...nel.org,
	yzaikin@...gle.com,
	tony.luck@...el.com,
	gpiccoli@...lia.com,
	al@...rsen.net,
	sfrench@...ba.org,
	pc@...guebit.com,
	lsahlber@...hat.com,
	sprasad@...rosoft.com,
	senozhatsky@...omium.org,
	phillip@...ashfs.org.uk,
	rostedt@...dmis.org,
	mhiramat@...nel.org,
	dushistov@...l.ru,
	hdegoede@...hat.com,
	djwong@...nel.org,
	dlemoal@...nel.org,
	naohiro.aota@....com,
	jth@...nel.org,
	ast@...nel.org,
	daniel@...earbox.net,
	andrii@...nel.org,
	martin.lau@...ux.dev,
	song@...nel.org,
	yhs@...com,
	john.fastabend@...il.com,
	kpsingh@...nel.org,
	sdf@...gle.com,
	haoluo@...gle.com,
	jolsa@...nel.org,
	hughd@...gle.com,
	akpm@...ux-foundation.org,
	davem@...emloft.net,
	edumazet@...gle.com,
	kuba@...nel.org,
	pabeni@...hat.com,
	john.johansen@...onical.com,
	paul@...l-moore.com,
	jmorris@...ei.org,
	serge@...lyn.com,
	stephen.smalley.work@...il.com,
	eparis@...isplace.org,
	jgross@...e.com,
	stern@...land.harvard.edu,
	lrh2000@....edu.cn,
	sebastian.reichel@...labora.com,
	wsa+renesas@...g-engineering.com,
	quic_ugoswami@...cinc.com,
	quic_linyyuan@...cinc.com,
	john@...ping.me.uk,
	error27@...il.com,
	quic_uaggarwa@...cinc.com,
	hayama@...eo.co.jp,
	jomajm@...il.com,
	axboe@...nel.dk,
	dhavale@...gle.com,
	dchinner@...hat.com,
	hannes@...xchg.org,
	zhangpeng362@...wei.com,
	slava@...eyko.com,
	gargaditya08@...e.com,
	penguin-kernel@...ove.SAKURA.ne.jp,
	yifeliu@...stonybrook.edu,
	madkar@...stonybrook.edu,
	ezk@...stonybrook.edu,
	yuzhe@...china.com,
	willy@...radead.org,
	okanatov@...il.com,
	jeffxu@...omium.org,
	linux@...blig.org,
	mirimmad17@...il.com,
	yijiangshan@...inos.cn,
	yang.yang29@....com.cn,
	xu.xin16@....com.cn,
	chengzhihao1@...wei.com,
	shr@...kernel.io,
	Liam.Howlett@...cle.com,
	adobriyan@...il.com,
	chi.minghao@....com.cn,
	roberto.sassu@...wei.com,
	linuszeng@...cent.com,
	bvanassche@....org,
	zohar@...ux.ibm.com,
	yi.zhang@...wei.com,
	trix@...hat.com,
	fmdefrancesco@...il.com,
	ebiggers@...gle.com,
	princekumarmaurya06@...il.com,
	chenzhongjin@...wei.com,
	riel@...riel.com,
	shaozhengchao@...wei.com,
	jingyuwang_vip@....com,
	linuxppc-dev@...ts.ozlabs.org,
	linux-kernel@...r.kernel.org,
	linux-s390@...r.kernel.org,
	linux-rdma@...r.kernel.org,
	linux-usb@...r.kernel.org,
	v9fs@...ts.linux.dev,
	linux-fsdevel@...r.kernel.org,
	linux-afs@...ts.infradead.org,
	autofs@...r.kernel.org,
	linux-mm@...ck.org,
	linux-btrfs@...r.kernel.org,
	ceph-devel@...r.kernel.org,
	codalist@...a.cs.cmu.edu,
	ecryptfs@...r.kernel.org,
	linux-efi@...r.kernel.org,
	linux-erofs@...ts.ozlabs.org,
	linux-ext4@...r.kernel.org,
	linux-f2fs-devel@...ts.sourceforge.net,
	cluster-devel@...hat.com,
	linux-um@...ts.infradead.org,
	linux-mtd@...ts.infradead.org,
	jfs-discussion@...ts.sourceforge.net,
	linux-nfs@...r.kernel.org,
	linux-nilfs@...r.kernel.org,
	linux-ntfs-dev@...ts.sourceforge.net,
	ntfs3@...ts.linux.dev,
	ocfs2-devel@...ts.linux.dev,
	linux-karma-devel@...ts.sourceforge.net,
	devel@...ts.orangefs.org,
	linux-unionfs@...r.kernel.org,
	linux-hardening@...r.kernel.org,
	reiserfs-devel@...r.kernel.org,
	linux-cifs@...r.kernel.org,
	samba-technical@...ts.samba.org,
	linux-trace-kernel@...r.kernel.org,
	linux-xfs@...r.kernel.org,
	bpf@...r.kernel.org,
	netdev@...r.kernel.org,
	apparmor@...ts.ubuntu.com,
	linux-security-module@...r.kernel.org,
	selinux@...r.kernel.org
Cc: Jan Kara <jack@...e.cz>
Subject: [PATCH v2 07/92] fs: add ctime accessors infrastructure

struct timespec64 has unused bits in the tv_nsec field that can be used
for other purposes. In future patches, we're going to change how the
inode->i_ctime is accessed in certain inodes in order to make use of
them. In order to do that safely though, we'll need to eradicate raw
accesses of the inode->i_ctime field from the kernel.

Add new accessor functions for the ctime that we use to replace them.

Reviewed-by: Jan Kara <jack@...e.cz>
Reviewed-by: Luis Chamberlain <mcgrof@...nel.org>
Signed-off-by: Jeff Layton <jlayton@...nel.org>
---
 fs/inode.c         | 16 ++++++++++++++++
 include/linux/fs.h | 45 ++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/fs/inode.c b/fs/inode.c
index d37fad91c8da..21b026d95b51 100644
--- a/fs/inode.c
+++ b/fs/inode.c
@@ -2499,6 +2499,22 @@ struct timespec64 current_time(struct inode *inode)
 }
 EXPORT_SYMBOL(current_time);
 
+/**
+ * inode_set_ctime_current - set the ctime to current_time
+ * @inode: inode
+ *
+ * Set the inode->i_ctime to the current value for the inode. Returns
+ * the current value that was assigned to i_ctime.
+ */
+struct timespec64 inode_set_ctime_current(struct inode *inode)
+{
+	struct timespec64 now = current_time(inode);
+
+	inode_set_ctime(inode, now.tv_sec, now.tv_nsec);
+	return now;
+}
+EXPORT_SYMBOL(inode_set_ctime_current);
+
 /**
  * in_group_or_capable - check whether caller is CAP_FSETID privileged
  * @idmap:	idmap of the mount @inode was found from
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 824accb89a91..bdfbd11a5811 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1474,7 +1474,50 @@ static inline bool fsuidgid_has_mapping(struct super_block *sb,
 	       kgid_has_mapping(fs_userns, kgid);
 }
 
-extern struct timespec64 current_time(struct inode *inode);
+struct timespec64 current_time(struct inode *inode);
+struct timespec64 inode_set_ctime_current(struct inode *inode);
+
+/**
+ * inode_get_ctime - fetch the current ctime from the inode
+ * @inode: inode from which to fetch ctime
+ *
+ * Grab the current ctime from the inode and return it.
+ */
+static inline struct timespec64 inode_get_ctime(const struct inode *inode)
+{
+	return inode->i_ctime;
+}
+
+/**
+ * inode_set_ctime_to_ts - set the ctime in the inode
+ * @inode: inode in which to set the ctime
+ * @ts: value to set in the ctime field
+ *
+ * Set the ctime in @inode to @ts
+ */
+static inline struct timespec64 inode_set_ctime_to_ts(struct inode *inode,
+						      struct timespec64 ts)
+{
+	inode->i_ctime = ts;
+	return ts;
+}
+
+/**
+ * inode_set_ctime - set the ctime in the inode
+ * @inode: inode in which to set the ctime
+ * @sec: tv_sec value to set
+ * @nsec: tv_nsec value to set
+ *
+ * Set the ctime in @inode to { @sec, @nsec }
+ */
+static inline struct timespec64 inode_set_ctime(struct inode *inode,
+						time64_t sec, long nsec)
+{
+	struct timespec64 ts = { .tv_sec  = sec,
+				 .tv_nsec = nsec };
+
+	return inode_set_ctime_to_ts(inode, ts);
+}
 
 /*
  * Snapshotting support.
-- 
2.41.0

Powered by blists - more mailing lists