From patchwork Thu Sep 28 11:03:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 13402484 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 964F4E732D1 for ; Thu, 28 Sep 2023 11:03:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 294FC8D00A6; Thu, 28 Sep 2023 07:03:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 244E68D0038; Thu, 28 Sep 2023 07:03:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 049CD8D00A6; Thu, 28 Sep 2023 07:03:36 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id E7F038D0038 for ; Thu, 28 Sep 2023 07:03:35 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id BD0BE80D39 for ; Thu, 28 Sep 2023 11:03:35 +0000 (UTC) X-FDA: 81285720390.04.E764D8A Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf07.hostedemail.com (Postfix) with ESMTP id EDF3D4000F for ; Thu, 28 Sep 2023 11:03:33 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=cgJqBVdg; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf07.hostedemail.com: domain of jlayton@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=jlayton@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695899014; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=4WjQgRNMdW3j3sfcIHlzIOpBIEpILEBwQl2Kii/SrPo=; b=a7YSG0ra5te5tVyB5TppfdL81II7NI4GQ8eL7xyKsdkEaOqrP6NhkzDg2jXngQ9MdnpYgM z/1y7JRftvYcUL1aNJffdqIlylyn6E3XLNxa8pjZQ35t2+yXatmjMUzUiDat8VoTrCKkqQ 5VjqHQ12hDYIFm8KU7RAWkGi+QDRwCs= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=cgJqBVdg; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf07.hostedemail.com: domain of jlayton@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=jlayton@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695899014; a=rsa-sha256; cv=none; b=MkM6eIl4cwQFLMgoywRkJbsu3QBNWVneXA+J6YdtWGz2JULi9ky7XafYKOKr3EFjyAlRQZ aKzncrIoDeCvwQz6th/xP87wOt/vqZoVTZdoSqngLWcAFTMahG1py9xagCQEr4sBYZDDw0 wHi14FyBqnhx473pguypGF5Sm8Crzy0= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id C8B4E61348; Thu, 28 Sep 2023 11:03:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BBF2CC433CD; Thu, 28 Sep 2023 11:03:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1695899012; bh=2HU082C0O+wshN8razE9iX9Rxehg6mRJCvsU5n9rFmw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cgJqBVdgRTRGPcB9AYO9nuxbQNU/aRFlsoq2/9IfdhTUxto7jaIgTs2iK3Hh6VNmI PQNGXum64iBmE5gmxTB5fzhsNqjzKt2sLpABU1iY4QR3sLG/3TAi2tRkz3bK5NdR2Q 5J/x2S1ciuMIVP8CxOGFxyla+hxGROy5UoKNIuzR78QFdYK0UlmPcZ7xnSW65TY0z1 d09jqnFZdRWx08/ZfFzae3DcpVgwGYgcj94ylvD+5VeIqKKaZOw2/kkGfhLURz1SoJ LecijjrtKtsZor5I1BxBnr+8zBdASh0oRnrtfNreKI0opyGPJWi1hjF5WHyNrggNrR Xz99F3TmopI2w== From: Jeff Layton To: Alexander Viro , Christian Brauner , Linus Torvalds , David Sterba , Amir Goldstein , Theodore Ts'o , Eric Biederman , Kees Cook , Jeremy Kerr , Arnd Bergmann , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Greg Kroah-Hartman , =?utf-8?q?Arve_Hj=C3=B8nne?= =?utf-8?q?v=C3=A5g?= , Todd Kjos , Martijn Coenen , Joel Fernandes , Carlos Llamas , Suren Baghdasaryan , Mattia Dongili , Dennis Dalessandro , Jason Gunthorpe , Leon Romanovsky , Brad Warrum , Ritu Agarwal , Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Mark Gross , Jiri Slaby , Eric Van Hensbergen , Latchesar Ionkov , Dominique Martinet , Christian Schoenebeck , David Sterba , David Howells , Marc Dionne , Ian Kent , Luis de Bethencourt , Salah Triki , "Tigran A. Aivazian" , Chris Mason , Josef Bacik , Xiubo Li , Ilya Dryomov , Jan Harkes , coda@cs.cmu.edu, Joel Becker , Christoph Hellwig , Nicolas Pitre , "Rafael J. Wysocki" , Ard Biesheuvel , Gao Xiang , Chao Yu , Yue Hu , Jeffle Xu , Namjae Jeon , Sungjong Seo , Jan Kara , Andreas Dilger , Jaegeuk Kim , OGAWA Hirofumi , Christoph Hellwig , Miklos Szeredi , Bob Peterson , Andreas Gruenbacher , Richard Weinberger , Anton Ivanov , Johannes Berg , Mikulas Patocka , Mike Kravetz , Muchun Song , Jan Kara , David Woodhouse , Dave Kleikamp , Tejun Heo , Trond Myklebust , Anna Schumaker , Chuck Lever , Neil Brown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Ryusuke Konishi , Anton Altaparmakov , Konstantin Komarov , Mark Fasheh , Joseph Qi , Bob Copeland , Mike Marshall , Martin Brandenburg , Luis Chamberlain , Iurii Zaikin , Tony Luck , "Guilherme G. Piccoli" , Anders Larsen , Steve French , Paulo Alcantara , Ronnie Sahlberg , Shyam Prasad N , Sergey Senozhatsky , Phillip Lougher , Steven Rostedt , Masami Hiramatsu , Evgeniy Dushistov , Chandan Babu R , "Darrick J. Wong" , Damien Le Moal , Naohiro Aota , Johannes Thumshirn , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Hugh Dickins , Andrew Morton , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , John Johansen , Paul Moore , James Morris , "Serge E. Hallyn" , Stephen Smalley , Eric Paris Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-rdma@vger.kernel.org, linux-serial@vger.kernel.org, linux-usb@vger.kernel.org, v9fs@lists.linux.dev, linux-afs@lists.infradead.org, autofs@vger.kernel.org, linux-btrfs@vger.kernel.org, ceph-devel@vger.kernel.org, codalist@coda.cs.cmu.edu, linux-efi@vger.kernel.org, linux-erofs@lists.ozlabs.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, gfs2@lists.linux.dev, linux-um@lists.infradead.org, linux-mtd@lists.infradead.org, jfs-discussion@lists.sourceforge.net, linux-nfs@vger.kernel.org, linux-nilfs@vger.kernel.org, linux-ntfs-dev@lists.sourceforge.net, ntfs3@lists.linux.dev, ocfs2-devel@lists.linux.dev, linux-karma-devel@lists.sourceforge.net, devel@lists.orangefs.org, linux-unionfs@vger.kernel.org, linux-hardening@vger.kernel.org, reiserfs-devel@vger.kernel.org, linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-trace-kernel@vger.kernel.org, linux-xfs@vger.kernel.org, bpf@vger.kernel.org, netdev@vger.kernel.org, apparmor@lists.ubuntu.com, linux-security-module@vger.kernel.org, selinux@vger.kernel.org Subject: [PATCH 01/87] fs: new accessor methods for atime and mtime Date: Thu, 28 Sep 2023 07:03:00 -0400 Message-ID: <20230928110300.32891-2-jlayton@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230928110300.32891-1-jlayton@kernel.org> References: <20230928110300.32891-1-jlayton@kernel.org> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: 5t8seqk76pebreshcu5rbtsm34uerh9b X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: EDF3D4000F X-HE-Tag: 1695899013-48742 X-HE-Meta: U2FsdGVkX1+y4R3Uc3AH5O9P87x74KjbzP6IGtntD9PYmy5blXG0/wqjZyhkcsTYx3cMxkC6V74T9TR1iOQ1+RiuGMR6fcQhzbRNXpQtYrMRatl786bgkdxGKCu2ws+u70w2ZN0NA5QU+4PxixZnp3PM05en68GK8bDaqrcxS5vMzboM/4Zc3QwFB4oYgwRNXOB9R89Bl+Ry8cs+20FaVrYd2VxKzlDLfu75vcS/RvBabeSim5TbYTK3u1BSM7rbiwjDnmTe2Rj6NXcR3G1DSUoqhr/W0nyOL2yomc7ByNRmQleNMs8IYekLghfcX05hdTZLJH+U/G1qiodE1rORVcWCrOHHNmKuN785JlqXsbyMOErlYbYZO1GS4ylHqPzcvS5EDuzHn8PUTDM+vsDumHSa7A2mgGmBZoQzkxhVvKK1GPL+WV7b2W6HMSLnb3iEHHmDrtJ7YHParTpoB7/MkxyixmNoJzzvn7mTYYJfcTOSUa1ckFbBUYV1Zb0V1ycOgMTotlCUzZr9xFfEvtm9/2eb+BAFbxkK4cPsqH8uto9vdBrTJ8Wy/DN5xWqWzmx1OXDYpHIkCFpzDzl6fVYKVuR5AK42I8+SWC6XnzEL350HuUn//2+7dOb486ZYWrCM5mTBKim0zfdQ7wdTJqpFfYcxcdJOo0Txxi3zbT7KJjKYdDcoHxFB2mjXy83oPvw9agt5eE5sbZpJFm8g29ySS4AljU8JQDaQKK1CanfFzEgB15TGNnRKbkaoD4tsvvs98Uosk495WfOeJ+nlbFqACfrDsjOAGjWGvsETv13voPMy3gGDESuLGmhdZxc3EWSDU9fCFB8YoX09Fxz0VbxTIPZykuRD+dIlpH3E8rq42pWEy4ESEkpZA5PYcQ+O3X6Y5ZFeED73wHeqVC28qpry6AYhvPLE4dAtkhYzR8QBZ3jM45BORSkVFCxuz2AC5pl7yTfsdeVo+dt8AvwatbQ 87lRo+6t tCCKLXJdkGs8UT5JOASl6HYCvm68uVaasDQn45Quk2sjoUpncOQk0tNcQ477rpd4Kjaz8nLREQfBvGXTUzQpQRVijw127vCkwWC2Gxj4JXWWUN5nQRJoBicUOEjYoReI9j3sUY6jdo1MuW7VW/Nu5O5Pke9MgtAmLGfTssCht16ENL2fvkai2eYls6/eEjG0+JPkXi6A6wde+M8cMnrxtma3AQjCME3rRmCR3VAnJ5oyBv6fMLfwlMsASc2E3lNxxVgw0uvuL6sqKORFgbJpDMy0+ExosOvTroc5UN6/8JHgHzcWFsCTnWAcOJa1gscXeX+hn7058Xep1GhGXCHbwWrfzkpcrQT8r4pWxvlxWv88y/DnrE4f8DsB6gSHHyREwSFxQtCp6GcDlbuq55RcW1TQoitPS/ictyb8TMb2Lt2RPFkMZX30tvf48ZkzIOpf49aWtYfuHUXocrKG1a0rzwEUK8SsC5Qi9cXOsAXob+vYN+FCZOcmDJtlpQsk/KRsrCK4gviYpgW0WGgh25lGHq7zSbFyuz2LNkTCmH7esiEaFcVgvd/oOG1t8yj5a5EXh9oPeG4BsZ9fR+nVDPZdjfcoZGOQqapZuDBGNJBFgpO3Th7TsgQTZny8wVrkaIPeUFFKLfExsxBr6w9IIJBj0P+vSODS3hrN+5sZZ3wT3RoiL4ENUgL9/ivARZPjk8gqE27avwy6TU6gSlLKaaIU9MeIKiaZ7kM3Y0meCuSLf9kaahQYM0qcR2fXlABuaRIC7WLm/xTmSZ/QGOFwFZLy4FTbFtRBJicx+bJd5p7q5Ewj4Na8VGgw7QuWr4KIoBhMaW/cuNmUEGSzTgDErBmgPzWdzhV3TbRUcvI+HK7FqEDD06ThG2vlIRu1IUtxyignV35TLBBOBFSrAMcRB4A6O8KWS27GvN9sYbmEhTYRJo1fxVSZiesaUuyVolF0o3WsoZ/BL5Sb58B433hpkwpK2s2dbHuQm MOxHMyFU xWCfbtdku3iojb4o0FS4nPKSgPqvW6WsxZdoWCPcZnINQCH6aMTDBjNqHuV1tC7ZBp2cQY7ULSZz7lu4ouTVVbXp5ZgCSxSfbLbh7U0HYxjpifwCdkpPSF3hOjOZyZHsPELyjAAuB+JCTzXCprznXysh1PV+FIO8pa0dj+4xbN7nEetlKF++XGD39XkISpmuNq/wjFcmxc/v0kXamYNf0kPTO31KyUmAV25+2k2KfvrbQFJy+MvrIfoR0GwENjUwYcYHSbHpVy3mt2Qhqrx5l5Ww6q4Gm0dYtCttSh/aWvZgqy1mGLiW5GqC8qFj2Afx0XWmScfW7GdrC/MNkS+BkCaFRLScW9eo9N638Cw/Dx8PCQLlBIpJlNJMfuapD3um8hgj9O6iRumFAM+TVaO1foOBefUvEvxRWpT4A0LhOOlQsB7OzZJnr4P2y7M/cIiEHMtuNtIbYSzqUZtJuPS0LbotlJK96cNim7OxiLJfFu0/JwxNGSKliOkM6pQXTVfXE9HrbYlBtI8j2mjgXWfZTJkyyMq/033cWRgok0JyYRGVsTgE96ZzYzinuLbZ+4A2TLIJvASuxzfDyNKDToaHWZPgw83XIW6l9mzDmwbDKB24YN9AWpKhVEddfR5LzE/+vv8teKQhjF8BdeBcGzy8UUMrJwfbhqn0P3uiK3rj7LwyU3O9SrQS3MCwlG13IHEloEKa1kZ18YyE8ZYYXAclvgyd/gTBV4U9wHrjnNS7Jtiyc11IEIrqHaZPf4Zcb6YTSnJ4kTnTyM7RKRaffm0OGQbxk3AyjBKo5wrD0M3h/vQV9BokRxEq+FnLP7ygLVl2+9SOMyyS1i3T0jc/4ddx1xZUKMaf2ythIyN31M4ZSJQwErrBfpcFGCaat8h78+QbiywZ51V1xyQEKYiHgtH4hEL8HznRiB1i04+5q8vPRlHckNI0jt+r0W7pogsCoV5b4bwIBL19s5V+DAx9XfN0VouGYKXdB lRlKxokq V2G+03NeZUngGx8WDmbousKLsFnJR6w3HtankJineur2l8qnTWTNqmCkUlt3Hjek7HjVkbqiyXe7DSzMA2QCU/WQPnGhM0opMT8yBbU20JhAy50Y99cFrSwZx1Cs9oU1h63k/xzvF8VIKW0pTakG5pqT2x/OtfCDBvpwdeFUIOpKUq/Jcb2HWrj1sCiBy1CQ94BLOesB0GkT6HnKVhcPzsMwCgtkAlylCEYec5OLD7sizI6dmKXki1lXDC/ReRJOZ30mW+z2t9sjggOeTjnUHNGYw0O+9sCR2h7HtN933RpRj3bmZY/I9IhzbwOvEUb6LwRJYSk/pf6Wdgp1z/sdyrXEPmRubwSocE8zmQAE5bDwznSwTVZglFFt5yOMoH763r435rui+ilNSN4kyRNUj1NkFyi71/9qubWA1gEszfn8pv9DXDFwh9cF0eTz+UGpRTbbzkNc/WydQSsGyLobPep3hLl0q3Mgk5UKAAfWTpSAbCVyV1hxyBLBdjhWk1PYbjvwhIFszvBo6uj4pkXMVlNceLjpfrDp26WpaSedmbLAe5fz2tgSFlpQvTBPIndmrNIb7W38kcxCj0NO4Pfi+kxcHRCizaYff3rhi45UcOtJCam2ASAL7wrOaDAaM+D868tCQMajMM1CfwLJcvur/WAiNqVVmad9PBWzfMMxnkiHcpd7vGPourG6biO6MqX9b3v0MGx9bZkbcr9d+Ybv4vg3j1x+d4bNGVKYUe3XURHgCNJJIKT26EJXGGqR5b0G3mnNE+fJISBxo2DCvdjEOjVKvDyoue6z9JUEl+gRr44M4QhQ+jTzt0yLdjZLz3g8W0WsTqRwUxthDvJ7utu56Zqgcp6CFKmQDIgkuJPsKgltwc31FNwaKfVVs9yFyOjyLd4cWd9feGw/eTdyst4AmuirQnlpa/Zp7t+CITGvXe3bEacuYYxqn/C4EF8HgHUrQT7WWWFb1FiiDeA1fCY5LUrV7jbg0 zdaMaAwd rCYq6BkFjHn188wmBWqwUMpsjjdNwYrmBsquKEGfPZTC0ggM8nPgghaJ+DefJxuEGS6UqON96lOYZP9xYjJoI7Nausez3/OydbExzL6qQyRDvWmxfOzmCvc+4uoJhPwqJO+k5Jcdr7dGXpjpZF3hW497jNk1d4LOaVk6JL6SgBdfIbJt0F/VGHTAh9sRdCSXhOt9ala5CeyT+tivr7unyvR9r2Iy3NeHLjY1lZkNpO9HJDFZlPqXJgObnZP2xiePgXVZ1QfHzUndzkoKuf5bPS2hnLC5n6huorhWPlmL2BdQX0hh7ozTJuReGExBTh3GfFmmPh58VtaAzht9T4dMyR3fXG5v8SrIrY5YPD4e4BKg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Recently, we converted the ctime accesses in the kernel to use new accessor functions. Linus recently pointed out though that if we add accessors for the atime and mtime, then that would allow us to seamlessly change how these timestamps are stored in the inode. Add new accessor functions for the atime and mtime that mirror the accessors for the ctime. Signed-off-by: Jeff Layton --- fs/libfs.c | 13 +++++++++++++ include/linux/fs.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/fs/libfs.c b/fs/libfs.c index 37f2d34ee090..f5cdc7f7f5b5 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -1912,3 +1912,16 @@ ssize_t direct_write_fallback(struct kiocb *iocb, struct iov_iter *iter, return direct_written + buffered_written; } EXPORT_SYMBOL_GPL(direct_write_fallback); + +/** + * simple_inode_init_ts - initialize the timestamps for a new inode + * @inode: inode to be initialized + * + * When a new inode is created, most filesystems set the timestamps to the + * current time. Add a helper to do this. + */ +struct timespec64 simple_inode_init_ts(struct inode *inode); +{ + return inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode); +} +EXPORT_SYMBOL(simple_inode_init_ts); diff --git a/include/linux/fs.h b/include/linux/fs.h index b528f063e8ff..12d247b82aa0 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1553,6 +1553,48 @@ static inline struct timespec64 inode_set_ctime(struct inode *inode, return inode_set_ctime_to_ts(inode, ts); } +static inline struct timespec64 inode_get_atime(const struct inode *inode) +{ + return inode->i_atime; +} + +static inline struct timespec64 inode_set_atime_to_ts(struct inode *inode, + struct timespec64 ts) +{ + inode->i_atime = ts; + return ts; +} + +static inline struct timespec64 inode_set_atime(struct inode *inode, + time64_t sec, long nsec) +{ + struct timespec64 ts = { .tv_sec = sec, + .tv_nsec = nsec }; + return inode_set_atime_to_ts(inode, ts); +} + +static inline struct timespec64 inode_get_mtime(const struct inode *inode) +{ + return inode->i_mtime; +} + +static inline struct timespec64 inode_set_mtime_to_ts(struct inode *inode, + struct timespec64 ts) +{ + inode->i_mtime = ts; + return ts; +} + +static inline struct timespec64 inode_set_mtime(struct inode *inode, + time64_t sec, long nsec) +{ + struct timespec64 ts = { .tv_sec = sec, + .tv_nsec = nsec }; + return inode_set_mtime_to_ts(inode, ts); +} + +struct timespec64 simple_inode_init_ts(struct inode *inode); + /* * Snapshotting support. */ From patchwork Thu Sep 28 11:02:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 13402652 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3881CE732C1 for ; Thu, 28 Sep 2023 11:04:22 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C7FB98D00A7; Thu, 28 Sep 2023 07:04:21 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id C57DD8D0038; Thu, 28 Sep 2023 07:04:21 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B46D98D00A7; Thu, 28 Sep 2023 07:04:21 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id A53948D0038 for ; Thu, 28 Sep 2023 07:04:21 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 82E261CA522 for ; Thu, 28 Sep 2023 11:04:21 +0000 (UTC) X-FDA: 81285722322.03.7A62A68 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf05.hostedemail.com (Postfix) with ESMTP id 30760100021 for ; Thu, 28 Sep 2023 11:04:18 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=V6CAZGur; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf05.hostedemail.com: domain of jlayton@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=jlayton@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695899059; a=rsa-sha256; cv=none; b=CmzVSIbTpYHMpL4tTTDfr/9y1oHUGM571KcnynyGa7A2J6QtE8k6OkXoqJorgl2LDkIKJg 6EgTtzDzFaZJL1jNUV1Uz4x9EMXwew4NeKU37YNNbqWlpP56nuJ0vY2jbmpXTidIiKXOPq 1801d4ag9XG4YeAbxAlLm8/sFXOqND4= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=V6CAZGur; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf05.hostedemail.com: domain of jlayton@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=jlayton@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695899059; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=26QZJkXyCteUGIdsYDAprJvEMbX5nG5qrG3vbj0j++g=; b=tQcmdhusN1ER9Yv/QNH2dkSQ1+8n5j6Znj3DO5ejFpQvG6XzlN0RuY+UmoOkS1Q87/PmdU 34R2ORb0s0shr6DCthexFcm1jbcaPJiMI68ULBuO/Pw+nR9CmmZO9LfESjjagM5G2V6rNw dZz2rtQ94K7a/AnS8ug3wN11cKc/DMU= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 8F242CE1AA5; Thu, 28 Sep 2023 11:04:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 810CDC433CC; Thu, 28 Sep 2023 11:04:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1695899055; bh=UA17NieiKuJUQtAvlfYpTNXdsMGRKLLOw/Cz8ngzkD4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V6CAZGurZISIkQMn+b7qANzD5KkJ97vaooKgKjDX0Cks6k8TEzUpepVAKk4oIlWwG +jzZnGzmicw5BtfxrPApbAGLtk/nvnTQ9Jv5ftuLQnDZfLM3d7WMfTSLDLANOnprnD D/mwlEpY82WLyYRan0BMiKRvcSd4JFXXqoXYLCSAZDxaDWLf2nc6sEoEg8+eUfCBAv 7JWU5Ug2iCxLmiKovVzNi+U0ye7uC7YDSrGbPNkjbeysP1E8oTSNAnrj2sLl7jo+Sp 5PrpsKTxEDXT9eYDzu2B5nmLgbMV6ozOr+FCNbxbj2dfcUC4IxYnKsLUmfp2/y31CZ mKGPuQvOuScJA== From: Jeff Layton To: Alexander Viro , Christian Brauner , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Eric Biederman , Kees Cook , linux-mm@kvack.org Subject: [PATCH 02/87] fs: convert core infrastructure to new {a,m}time accessors Date: Thu, 28 Sep 2023 07:02:11 -0400 Message-ID: <20230928110413.33032-1-jlayton@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230928110300.32891-1-jlayton@kernel.org> References: <20230928110300.32891-1-jlayton@kernel.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 30760100021 X-Stat-Signature: sucg377jrw6mzuwxharn3d6b8ix94g7t X-HE-Tag: 1695899058-296409 X-HE-Meta: U2FsdGVkX1+dpcuJigDWhTDO9CzAKFhQRRa8xqYusmI3Uw7vj8Z1S44QW9Dnevx+zOhkbdpKpjuBMgh7/hDeCpvrweVNHPHzl/sn33idsjwCBMNPbrPbQ2hnFMhdL4skEHY1qqgkn0nNA/DGiRInWZGur0O1J5ImykoEMyBiLfkjyBlb7MjfmiVkrsR19Jk01BXewd54druD/Fj5qQcJGM4YCS8N8nnjy+aabyrOc4zKTfnlqDBu1tmjkvD9+GyNV4Hh2m7fc5pc6V9h7A0df5PmWXmU1q6FI08hgQSEZoZuHpvppkiBFqVPgVMumN7YUqHyivASokPY6bU5AyhUtHviFArIosHMxdFgFsmuVHHvtLZuPRN1DKr+PlFUvTgc7VSZrZRAspwaplbK0lfSvh0ntGANsXLm0U1Q37AMFkWRz8MdZMjpBnLjF4xvSTV/od+f9+zJBhT7pUyCgjyVmvn75/E/qdxU7d+Kb2WaJa7O2hM2VzSdkAhH8p2YtfTDL97BBNhzEfejr9CEomYBaEygEQZwdDzHuBGtORk5H/IujZhJ7fXP5YbXXg+eD/2mr9L/Mb/Glgb/cITZWLwaCyZTmgs90sJPdvps/tjoTjLPKDM3X5mh1RXjE4dRuAXLJFW+l7DwMNUAdAWHWJioBzptU2E0yF+oWhWnkDjKN17v2Z88CiSuyckfyVgvcgEITnEaJ8AiTy1opJkxP2zDSTDMrkfVN9CWqBqbfJ+WZN/Fja3eCt1LETM8NDTf1Osskev/pV/d3OBMQaluRQM4Ya0G/nQUOrIKMn0UecoKNyIU1w2Qs00AiviPy63E1HsZddfQTRr6GxKwUQsoenFz5r4/T0umXGVnYSfMUUp+1XBto7FM11yQIm1rwOXFwWmneHKpd/22o8VJVMD7MtQUMQeeDm7jEPm8ECbEQiIYhMCRZJcf9mnMR1dy+vdxGWj4EKNALcybP2qKBqAF10y z1nvNO9x W9pnyW2wyOLCApakZ75/xrj076H8Z6uozusteSN3FU37WdFtUqBy5mosiedYrfhfPKEgyYT4S7VUAfKTfz9r8R7zXkzEeHKUyIe2zcKH3OootJH5QvbdRCI+lUk41M6pxYXrFuQ9dJcSxMwqxSDDUJK+h53fu1nCF+zcqJKyzZ1LoEbkhLVC26pFOq9d9Uhk+ts6+Lfm8eUEECWpeL/+UKNV9JqkAWi+hjceSCbxpo6E5ej3wMlxlw1jMOQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Convert the core filesystem code to use the new atime and mtime accessor functions. Signed-off-by: Jeff Layton --- fs/attr.c | 4 ++-- fs/bad_inode.c | 2 +- fs/binfmt_misc.c | 2 +- fs/inode.c | 35 +++++++++++++++++++++-------------- fs/libfs.c | 32 +++++++++++++++++++------------- fs/nsfs.c | 2 +- fs/pipe.c | 2 +- fs/stack.c | 4 ++-- fs/stat.c | 4 ++-- include/linux/fs_stack.h | 6 +++--- 10 files changed, 53 insertions(+), 40 deletions(-) diff --git a/fs/attr.c b/fs/attr.c index a8ae5f6d9b16..bdf5deb06ea9 100644 --- a/fs/attr.c +++ b/fs/attr.c @@ -308,9 +308,9 @@ void setattr_copy(struct mnt_idmap *idmap, struct inode *inode, i_uid_update(idmap, attr, inode); i_gid_update(idmap, attr, inode); if (ia_valid & ATTR_ATIME) - inode->i_atime = attr->ia_atime; + inode_set_atime_to_ts(inode, attr->ia_atime); if (ia_valid & ATTR_MTIME) - inode->i_mtime = attr->ia_mtime; + inode_set_mtime_to_ts(inode, attr->ia_mtime); if (ia_valid & ATTR_CTIME) inode_set_ctime_to_ts(inode, attr->ia_ctime); if (ia_valid & ATTR_MODE) { diff --git a/fs/bad_inode.c b/fs/bad_inode.c index 83f9566c973b..316d88da2ce1 100644 --- a/fs/bad_inode.c +++ b/fs/bad_inode.c @@ -208,7 +208,7 @@ void make_bad_inode(struct inode *inode) remove_inode_hash(inode); inode->i_mode = S_IFREG; - inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode); + simple_inode_init_ts(inode); inode->i_op = &bad_inode_ops; inode->i_opflags &= ~IOP_XATTR; inode->i_fop = &bad_file_ops; diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c index e0108d17b085..5d2be9b0a0a5 100644 --- a/fs/binfmt_misc.c +++ b/fs/binfmt_misc.c @@ -547,7 +547,7 @@ static struct inode *bm_get_inode(struct super_block *sb, int mode) if (inode) { inode->i_ino = get_next_ino(); inode->i_mode = mode; - inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode); + simple_inode_init_ts(inode); } return inode; } diff --git a/fs/inode.c b/fs/inode.c index 84bc3c76e5cc..0612ad9c0227 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -1837,27 +1837,29 @@ EXPORT_SYMBOL(bmap); static int relatime_need_update(struct vfsmount *mnt, struct inode *inode, struct timespec64 now) { - struct timespec64 ctime; + struct timespec64 atime, mtime, ctime; if (!(mnt->mnt_flags & MNT_RELATIME)) return 1; /* * Is mtime younger than or equal to atime? If yes, update atime: */ - if (timespec64_compare(&inode->i_mtime, &inode->i_atime) >= 0) + atime = inode_get_atime(inode); + mtime = inode_get_mtime(inode); + if (timespec64_compare(&mtime, &atime) >= 0) return 1; /* * Is ctime younger than or equal to atime? If yes, update atime: */ ctime = inode_get_ctime(inode); - if (timespec64_compare(&ctime, &inode->i_atime) >= 0) + if (timespec64_compare(&ctime, &atime) >= 0) return 1; /* * Is the previous atime value older than a day? If yes, * update atime: */ - if ((long)(now.tv_sec - inode->i_atime.tv_sec) >= 24*60*60) + if ((long)(now.tv_sec - atime.tv_sec) >= 24*60*60) return 1; /* * Good, we can skip the atime update: @@ -1888,12 +1890,13 @@ int inode_update_timestamps(struct inode *inode, int flags) if (flags & (S_MTIME|S_CTIME|S_VERSION)) { struct timespec64 ctime = inode_get_ctime(inode); + struct timespec64 mtime = inode_get_mtime(inode); now = inode_set_ctime_current(inode); if (!timespec64_equal(&now, &ctime)) updated |= S_CTIME; - if (!timespec64_equal(&now, &inode->i_mtime)) { - inode->i_mtime = now; + if (!timespec64_equal(&now, &mtime)) { + inode_set_mtime_to_ts(inode, now); updated |= S_MTIME; } if (IS_I_VERSION(inode) && inode_maybe_inc_iversion(inode, updated)) @@ -1903,8 +1906,10 @@ int inode_update_timestamps(struct inode *inode, int flags) } if (flags & S_ATIME) { - if (!timespec64_equal(&now, &inode->i_atime)) { - inode->i_atime = now; + struct timespec64 atime = inode_get_atime(inode); + + if (!timespec64_equal(&now, &atime)) { + inode_set_atime_to_ts(inode, now); updated |= S_ATIME; } } @@ -1963,7 +1968,7 @@ EXPORT_SYMBOL(inode_update_time); bool atime_needs_update(const struct path *path, struct inode *inode) { struct vfsmount *mnt = path->mnt; - struct timespec64 now; + struct timespec64 now, atime; if (inode->i_flags & S_NOATIME) return false; @@ -1989,7 +1994,8 @@ bool atime_needs_update(const struct path *path, struct inode *inode) if (!relatime_need_update(mnt, inode, now)) return false; - if (timespec64_equal(&inode->i_atime, &now)) + atime = inode_get_atime(inode); + if (timespec64_equal(&atime, &now)) return false; return true; @@ -2106,17 +2112,18 @@ static int inode_needs_update_time(struct inode *inode) { int sync_it = 0; struct timespec64 now = current_time(inode); - struct timespec64 ctime; + struct timespec64 ts; /* First try to exhaust all avenues to not sync */ if (IS_NOCMTIME(inode)) return 0; - if (!timespec64_equal(&inode->i_mtime, &now)) + ts = inode_get_mtime(inode); + if (!timespec64_equal(&ts, &now)) sync_it = S_MTIME; - ctime = inode_get_ctime(inode); - if (!timespec64_equal(&ctime, &now)) + ts = inode_get_ctime(inode); + if (!timespec64_equal(&ts, &now)) sync_it |= S_CTIME; if (IS_I_VERSION(inode) && inode_iversion_need_inc(inode)) diff --git a/fs/libfs.c b/fs/libfs.c index f5cdc7f7f5b5..abe2b5a40ba1 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -541,7 +541,8 @@ void simple_recursive_removal(struct dentry *dentry, dput(victim); // unpin it } if (victim == dentry) { - inode->i_mtime = inode_set_ctime_current(inode); + inode_set_mtime_to_ts(inode, + inode_set_ctime_current(inode)); if (d_is_dir(dentry)) drop_nlink(inode); inode_unlock(inode); @@ -582,7 +583,7 @@ static int pseudo_fs_fill_super(struct super_block *s, struct fs_context *fc) */ root->i_ino = 1; root->i_mode = S_IFDIR | S_IRUSR | S_IWUSR; - root->i_atime = root->i_mtime = inode_set_ctime_current(root); + simple_inode_init_ts(root); s->s_root = d_make_root(root); if (!s->s_root) return -ENOMEM; @@ -638,8 +639,8 @@ int simple_link(struct dentry *old_dentry, struct inode *dir, struct dentry *den { struct inode *inode = d_inode(old_dentry); - dir->i_mtime = inode_set_ctime_to_ts(dir, - inode_set_ctime_current(inode)); + inode_set_mtime_to_ts(dir, + inode_set_ctime_to_ts(dir, inode_set_ctime_current(inode))); inc_nlink(inode); ihold(inode); dget(dentry); @@ -673,8 +674,8 @@ int simple_unlink(struct inode *dir, struct dentry *dentry) { struct inode *inode = d_inode(dentry); - dir->i_mtime = inode_set_ctime_to_ts(dir, - inode_set_ctime_current(inode)); + inode_set_mtime_to_ts(dir, + inode_set_ctime_to_ts(dir, inode_set_ctime_current(inode))); drop_nlink(inode); dput(dentry); return 0; @@ -709,9 +710,10 @@ void simple_rename_timestamp(struct inode *old_dir, struct dentry *old_dentry, { struct inode *newino = d_inode(new_dentry); - old_dir->i_mtime = inode_set_ctime_current(old_dir); + inode_set_mtime_to_ts(old_dir, inode_set_ctime_current(old_dir)); if (new_dir != old_dir) - new_dir->i_mtime = inode_set_ctime_current(new_dir); + inode_set_mtime_to_ts(new_dir, + inode_set_ctime_current(new_dir)); inode_set_ctime_current(d_inode(old_dentry)); if (newino) inode_set_ctime_current(newino); @@ -926,7 +928,7 @@ int simple_fill_super(struct super_block *s, unsigned long magic, */ inode->i_ino = 1; inode->i_mode = S_IFDIR | 0755; - inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode); + simple_inode_init_ts(inode); inode->i_op = &simple_dir_inode_operations; inode->i_fop = &simple_dir_operations; set_nlink(inode, 2); @@ -952,7 +954,7 @@ int simple_fill_super(struct super_block *s, unsigned long magic, goto out; } inode->i_mode = S_IFREG | files->mode; - inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode); + simple_inode_init_ts(inode); inode->i_fop = files->ops; inode->i_ino = i; d_add(dentry, inode); @@ -1520,7 +1522,7 @@ struct inode *alloc_anon_inode(struct super_block *s) inode->i_uid = current_fsuid(); inode->i_gid = current_fsgid(); inode->i_flags |= S_PRIVATE; - inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode); + simple_inode_init_ts(inode); return inode; } EXPORT_SYMBOL(alloc_anon_inode); @@ -1920,8 +1922,12 @@ EXPORT_SYMBOL_GPL(direct_write_fallback); * When a new inode is created, most filesystems set the timestamps to the * current time. Add a helper to do this. */ -struct timespec64 simple_inode_init_ts(struct inode *inode); +struct timespec64 simple_inode_init_ts(struct inode *inode) { - return inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode); + struct timespec64 ts = inode_set_ctime_current(inode); + + inode_set_atime_to_ts(inode, ts); + inode_set_mtime_to_ts(inode, ts); + return ts; } EXPORT_SYMBOL(simple_inode_init_ts); diff --git a/fs/nsfs.c b/fs/nsfs.c index 647a22433bd8..9a4b228d42fa 100644 --- a/fs/nsfs.c +++ b/fs/nsfs.c @@ -84,7 +84,7 @@ static int __ns_get_path(struct path *path, struct ns_common *ns) return -ENOMEM; } inode->i_ino = ns->inum; - inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode); + simple_inode_init_ts(inode); inode->i_flags |= S_IMMUTABLE; inode->i_mode = S_IFREG | S_IRUGO; inode->i_fop = &ns_file_operations; diff --git a/fs/pipe.c b/fs/pipe.c index 139190165a1c..b96a5918d064 100644 --- a/fs/pipe.c +++ b/fs/pipe.c @@ -898,7 +898,7 @@ static struct inode * get_pipe_inode(void) inode->i_mode = S_IFIFO | S_IRUSR | S_IWUSR; inode->i_uid = current_fsuid(); inode->i_gid = current_fsgid(); - inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode); + simple_inode_init_ts(inode); return inode; diff --git a/fs/stack.c b/fs/stack.c index b5e01bdb5f5f..f18920119944 100644 --- a/fs/stack.c +++ b/fs/stack.c @@ -66,8 +66,8 @@ void fsstack_copy_attr_all(struct inode *dest, const struct inode *src) dest->i_uid = src->i_uid; dest->i_gid = src->i_gid; dest->i_rdev = src->i_rdev; - dest->i_atime = src->i_atime; - dest->i_mtime = src->i_mtime; + inode_set_atime_to_ts(dest, inode_get_atime(src)); + inode_set_mtime_to_ts(dest, inode_get_mtime(src)); inode_set_ctime_to_ts(dest, inode_get_ctime(src)); dest->i_blkbits = src->i_blkbits; dest->i_flags = src->i_flags; diff --git a/fs/stat.c b/fs/stat.c index d43a5cc1bfa4..24bb0209e459 100644 --- a/fs/stat.c +++ b/fs/stat.c @@ -57,8 +57,8 @@ void generic_fillattr(struct mnt_idmap *idmap, u32 request_mask, stat->gid = vfsgid_into_kgid(vfsgid); stat->rdev = inode->i_rdev; stat->size = i_size_read(inode); - stat->atime = inode->i_atime; - stat->mtime = inode->i_mtime; + stat->atime = inode_get_atime(inode); + stat->mtime = inode_get_mtime(inode); stat->ctime = inode_get_ctime(inode); stat->blksize = i_blocksize(inode); stat->blocks = inode->i_blocks; diff --git a/include/linux/fs_stack.h b/include/linux/fs_stack.h index 010d39d0dc1c..2b1f74b24070 100644 --- a/include/linux/fs_stack.h +++ b/include/linux/fs_stack.h @@ -16,14 +16,14 @@ extern void fsstack_copy_inode_size(struct inode *dst, struct inode *src); static inline void fsstack_copy_attr_atime(struct inode *dest, const struct inode *src) { - dest->i_atime = src->i_atime; + inode_set_atime_to_ts(dest, inode_get_atime(src)); } static inline void fsstack_copy_attr_times(struct inode *dest, const struct inode *src) { - dest->i_atime = src->i_atime; - dest->i_mtime = src->i_mtime; + inode_set_atime_to_ts(dest, inode_get_atime(src)); + inode_set_mtime_to_ts(dest, inode_get_mtime(src)); inode_set_ctime_to_ts(dest, inode_get_ctime(src)); } From patchwork Thu Sep 28 11:02:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 13402653 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 89CA3E732C6 for ; Thu, 28 Sep 2023 11:05:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 073138D00A8; Thu, 28 Sep 2023 07:05:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 023CD8D0038; Thu, 28 Sep 2023 07:05:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E54438D00A8; Thu, 28 Sep 2023 07:05:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id D6BE18D0038 for ; Thu, 28 Sep 2023 07:05:07 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 9C6FDB3DDD for ; Thu, 28 Sep 2023 11:05:07 +0000 (UTC) X-FDA: 81285724254.16.9D4BD4C Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf04.hostedemail.com (Postfix) with ESMTP id EA13940020 for ; Thu, 28 Sep 2023 11:05:05 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Lk6lU76r; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf04.hostedemail.com: domain of jlayton@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=jlayton@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695899106; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=mv8IuoczD8+D4W/8RWeO9KR6l1WixCMirVn7db+ONRs=; b=fzE/6IRaoGdrbskGyNa7kFHXdi3hQy0vAoqlbV+cy84PYtS/a4PlWxc/Ru2TzFwHG09wnY RpqNUQCnc3iE+rzfCOf8DArYu4ElaPK//LcjrURtxhIfYdN3cTp47QM4UxFUqZ3XeqBlCv nBsbixA2TqyBLVKY3yUemwy8Wcwz5KE= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=Lk6lU76r; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf04.hostedemail.com: domain of jlayton@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=jlayton@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695899106; a=rsa-sha256; cv=none; b=PhxWg8NBUOldWvtpoQn2H9GH5azDSqFdPiiiNMXlc0eBvtDUI0QRVk8ESEsnoXvyJnScQq XlXWkRgm/idiBwYU/IZjFAJ0+WdTWe6IMhvPlFXZVn2KRFAiyAgOlWM4N7XsCQBtg0gijL OcDVDHMYb5lrmIE5Spp1QCbdsgijWJ0= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 22122615B7; Thu, 28 Sep 2023 11:05:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 66E2DC433C7; Thu, 28 Sep 2023 11:05:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1695899104; bh=WdhKVeDvEbKnuqVE8JioBf7/XuFh9c0DQ7/RiYq45FU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Lk6lU76rtis34gPcawFKYvC3t92lkvckjaFjUIluPI3HFE3OLVD5JnhI3R/rVMN7r F8czyTGJsP3qg3qvVwQLSTHLuSyrC0haq2UAKJra1gJAoQFpr99CN3v3mhZ6xsognJ yozcfjf26Nea0TfCxH8Vc/BNVQHQBJKESwH+U2q01uSM0hBTcrS7QUbw9WTVPm8yuG ex+WxCbn/K5N0oH3t1IZtrwihqdPcZRS3iWr07rRton6NuqSfucu3Sy2htGrrOwNpi x6tTG961YMV7gvUwsQo6MW1Xu0Ba7256DKzhqrfuFgVIH9idX1Q+JtwAwtDVxbGYs3 j5W14p/tJlYsg== From: Jeff Layton To: Alexander Viro , Christian Brauner , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org Subject: [PATCH 44/87] fs/hugetlbfs: convert to new inode {a,m}time accessors Date: Thu, 28 Sep 2023 07:02:53 -0400 Message-ID: <20230928110413.33032-43-jlayton@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230928110413.33032-1-jlayton@kernel.org> References: <20230928110300.32891-1-jlayton@kernel.org> <20230928110413.33032-1-jlayton@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: EA13940020 X-Stat-Signature: h9op61g8ycrzoqksyh6ceknru471cu55 X-Rspam-User: X-HE-Tag: 1695899105-5451 X-HE-Meta: U2FsdGVkX1861sHDitFsm8hMmxD1cYb/uWMBBIMUp1Fh5On9iLjYEa+QSAuSwsaij2qI2+OxAH54VIDGaWvrKgtOHz/fBD4Iz41YQPfMdtpAjzyaAEttthbO8HaySjq5sA8brjdzdeNWdUt5TESxz3YtYB+0CB6bLRJDhj+j19ntMBPtuRUD3NxmK+dlTDVsudnysAwOBzXL5Hk23qrkWxmiVY9PLTLh0Tdn3yu6mZJPtwfYF0Pj4kyhJw9nf/sCZSyFMZIYvX0kq/G+rW9yF35aQaKt5+BDNqi9GehM04MWiNDrqZmTdjtWU+w7HClxtQbe9lbU4wJqgG7TU0sBkIO5EZh+WdL0D3Wy7piFzjri58xGM4AZ1kYKxEze4174wAACCh8Evvl0p92VTM/C1WH1IbNH/E6cr96byBUH/L+l77vh/4SaHyChiDXDoSM7MSF7rrC2/gh/2jgUNwQE4qdj7pFueAvhqDYU03hS5yynYQpEpBT4ruE8RKap7BauZ8lPNDmGZ+4Vs1GsYnufFc/WdoGHdR6GlfPpTZYZLcGsHhXEkcbVtE6QINR9gK2ylDbDRTRnNW4TSR7VCpvPkseToCo21lwdZF0sLJ5udl6WrrVYryt0P48PFbnUcySpZeam03uVH7gfRGTrh2QhkF5H+IsiO4ZbmBUXZ++Gq59A8q/0/6CF7ZMC4G2Br6tGODvkEBDe9JS4E+0kw88DuHXzJ0Y1sKqJtn7Up1cm0UVfmtyWzEnnuC7VLw+/UgTfqf7MEbvAn1v5SsUB54Mm4XQB0FBhWFhi+N1xPYUR1y5Ohqoju2h5ujdtwJbDonvK1jQMbs7r9STLncXtj8sEAR4CtXhgBwWeGHzsW7cbiKk5G8Jmv6OrEXmcNSgtjLrKOMND65jnxc4DI3VGxEAOtmiNd+icsqpfNq9Cu1uTh3M/d76lHAXBvTdhy5w15iIkpeniHTVgNgYWvdSHl1u u5FzRMLU V3oOX5+0z7MhjJfEAYf+6IrRaDnTwXq51eoxWFkcz84QO+Kx4OZo2Nz+9yXTUq1+CWJU33PLUiYoqEiC/sRxQDSKXG5Y1h3qhYzaB9dqL4lgNmqJbCnqRGAlB5ct4SuvKge7J4TsxDZabQffAT6rDadry+9okOmqHZSYD9SooEPXC0PGlGinssslXxFev8uSPYMOpnZRLblNgkM95v/seOHBgofBktzbQM5/OfI4FLcQiYlDgwdjiHETeRA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Signed-off-by: Jeff Layton --- fs/hugetlbfs/inode.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index 316c4cebd3f3..da217eaba102 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -980,7 +980,7 @@ static struct inode *hugetlbfs_get_root(struct super_block *sb, inode->i_mode = S_IFDIR | ctx->mode; inode->i_uid = ctx->uid; inode->i_gid = ctx->gid; - inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode); + simple_inode_init_ts(inode); inode->i_op = &hugetlbfs_dir_inode_operations; inode->i_fop = &simple_dir_operations; /* directory inodes start off with i_nlink == 2 (for "." entry) */ @@ -1024,7 +1024,7 @@ static struct inode *hugetlbfs_get_inode(struct super_block *sb, lockdep_set_class(&inode->i_mapping->i_mmap_rwsem, &hugetlbfs_i_mmap_rwsem_key); inode->i_mapping->a_ops = &hugetlbfs_aops; - inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode); + simple_inode_init_ts(inode); inode->i_mapping->private_data = resv_map; info->seals = F_SEAL_SEAL; switch (mode & S_IFMT) { @@ -1067,7 +1067,7 @@ static int hugetlbfs_mknod(struct mnt_idmap *idmap, struct inode *dir, inode = hugetlbfs_get_inode(dir->i_sb, dir, mode, dev); if (!inode) return -ENOSPC; - dir->i_mtime = inode_set_ctime_current(dir); + inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir)); d_instantiate(dentry, inode); dget(dentry);/* Extra count - pin the dentry in core */ return 0; @@ -1099,7 +1099,7 @@ static int hugetlbfs_tmpfile(struct mnt_idmap *idmap, inode = hugetlbfs_get_inode(dir->i_sb, dir, mode | S_IFREG, 0); if (!inode) return -ENOSPC; - dir->i_mtime = inode_set_ctime_current(dir); + inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir)); d_tmpfile(file, inode); return finish_open_simple(file, 0); } @@ -1121,7 +1121,7 @@ static int hugetlbfs_symlink(struct mnt_idmap *idmap, } else iput(inode); } - dir->i_mtime = inode_set_ctime_current(dir); + inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir)); return error; } From patchwork Thu Sep 28 11:03:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 13402654 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 45C6BE732C0 for ; Thu, 28 Sep 2023 11:05:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8D8E58D00A9; Thu, 28 Sep 2023 07:05:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8882B8D0038; Thu, 28 Sep 2023 07:05:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 777AC8D00A9; Thu, 28 Sep 2023 07:05:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 693928D0038 for ; Thu, 28 Sep 2023 07:05:52 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 3F5D3160EEC for ; Thu, 28 Sep 2023 11:05:52 +0000 (UTC) X-FDA: 81285726144.02.8F1C0FA Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf04.hostedemail.com (Postfix) with ESMTP id 8F55740005 for ; Thu, 28 Sep 2023 11:05:50 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=By3nvlPw; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf04.hostedemail.com: domain of jlayton@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=jlayton@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695899150; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=AdPVq+Gl0KsbrSlD4qkrIxGVCyOaXKBg1Kci98DRBBw=; b=ZPWenpVmGx2n1igaOfu0XsGTAUNFrO0QbaLRrZMdI7XhKMrGIRCSNUSJr3PStcdKH7K6M/ TekdnlWHc6Tn/4wr9OTd6CO6Yyxlfrpt4c/luWWeqtkhFdR1Iqo3vShBth9YCLiqqLFwNH ILIghWakaMa2TUpHzVyTgqEWZIkvsuE= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=By3nvlPw; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf04.hostedemail.com: domain of jlayton@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=jlayton@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695899150; a=rsa-sha256; cv=none; b=EOV7tauf31XkWW+XuWWfzU+Bd2CNM+aXZ8zpfRbp/b/cb6PtVo+7KA6rZSdKH9DGrwYnjS zisbKRRqDL/T3RzzSgCTMdyy1oUTdPm0vtQ9yXJabtXsEa52VWEKrVtu7XHaaGj+i9LLHO tJns0gaz/vrGB4e4gbTwV1TupYiC7ao= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id BF3BA61353; Thu, 28 Sep 2023 11:05:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA775C116A4; Thu, 28 Sep 2023 11:05:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1695899149; bh=uFrEzvYVQCsriiMGkk8AKLTd0LQsQsSJjSLze8FhJ9E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=By3nvlPwwALdU/McvKHBoddMEDKfobu2wT0jBMPExLOGfgXT7dqsgh7GI1xdf7haq wDtMEr6nybvX6l/M/85HTUlMX7yEVTLkzoFkHYiJ/3wP9SVesXSe1RTNOgJhfJ1rdo 3Y13+MJ0VUOStyZz/0Oq/gy3FNncWzGLN29tLpmVFCDOTUuDS2oCpQBF+53VkbPuea wNUZrINU+eN/Rw+31QzziJWDr3kybOsf88fvuRociCfPJ0EOGi8zZjvVrBNP0JHknr jWNtQBkKy0PIMofs4A2OaNWPYgsTY5zB0TzMvYSY0JUMxCdOIl2Wq1XyDxxjA1+F06 vsMHBm6doTiXQ== From: Jeff Layton To: Alexander Viro , Christian Brauner , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org Subject: [PATCH 80/87] mm: convert to new inode {a,m}time accessors Date: Thu, 28 Sep 2023 07:03:29 -0400 Message-ID: <20230928110413.33032-79-jlayton@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230928110413.33032-1-jlayton@kernel.org> References: <20230928110300.32891-1-jlayton@kernel.org> <20230928110413.33032-1-jlayton@kernel.org> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 8F55740005 X-Stat-Signature: n51tska65a6fh6gtgw59o48arkj13zs1 X-HE-Tag: 1695899150-505465 X-HE-Meta: U2FsdGVkX1/X+x8I9srfp5BPRaDmo++Zz+65B/NU75u4q5ii7/tUww38h/C2+VRwdrDdIYvg08AycVABMhejEe0NOwXGoD9CvV5keicg5GybM96WQuuMmAdB/NKz15is2ih4ZPHSfpCHer4dRmTu/VoQ5rX0vtrPUA10MJhaDop7QVxJF8IzqClEoGpP0lpaCmEr/3PZYtGsVC7w0ItoEc4Ol8FIloFucbhv1cZbgFQbphF/fR3ChKiqWNObjtXg3xnkNP18f1CfQmeXE8Oz9vgNg4OeDKIjJt7HtkKKP48JT8sw22iC8a7wnh5AZTDZUymxFp9QW+k0255X5p3frWpdA//bLFlAil9TNHqbU58AvpQZMmyCbYiOM1yVtG0BiJYb9XZ9uLXfYRMIApMDeWm8slwCuqrpD3tkvVgduGpWNyvqEddCajEhKqNVoiFo4t1r1tKM52JWhMOfopLU4IBq7nGewwZ0PqbRyv9Sw/zgNNj/elmWb6RQUZYu/0GBOueohFF4fKyJ9itvkkIg2YfoJTVldhKNyQO+LGArW88zrdpS5bgcS/TfxgTE2dQN1sVBlADQH/GWayFBgIgwUag2xeNFhgGux9Dc8g7d5/HGwRHamX34bHnGULtJWAaJp/JHOOG88ReHB7xc4JBPBQVvw0cFoI2ZuYKpPsVfRQhA880jrbBrZKJvQNuF8eggEKO/S+VZFavxnRR4Uf9ERDBeco5yhNiPkkfvpVLhl3kPvh6yXa41JA1DQf1hktnpzGZ1o08be0BBKn9AWKVgX663BLBYGMXofCHiLefYBmKreRJuKeH8ZSM2bckvFKGOKC7fnBPohC3YnDEvi1MPgmT1y+hHda35tOVqqRaCKbG6nrWN7i4Lk7VlAHNnG6HRpyWyDPY2yDwz2OYgSojDTmEM+0J+nOkqSouKun11macuxH+7ckKZI+l/d1gzhH04nZ9HAgPpjz0fA7ukP/X XNOSoYJ0 OT2LDZynDqE1yOgo2J13GxVEh0CaezU2csFoKRXJjX5NuvjfboTgZ1Y2mjv30Cs5OeHINlnCbzXWaDpFGDT+/0pfEZA2Agw+79WibRNoHERFz/wWNWw6/OY+BKscTASoTfkW26QrlQSaZJ9WuSQMCACa+Aqfig2c3HFldVfVxO+8tdloCoBWpkkKLWDsks1mvrE67NctGESIe2P+vp6Us87FzIjmxqVj1ilUe32MHti4pUESoVvEEuN09Kg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Signed-off-by: Jeff Layton --- mm/shmem.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 69595d341882..c48239bfa646 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1112,7 +1112,7 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend, void shmem_truncate_range(struct inode *inode, loff_t lstart, loff_t lend) { shmem_undo_range(inode, lstart, lend, false); - inode->i_mtime = inode_set_ctime_current(inode); + inode_set_mtime_to_ts(inode, inode_set_ctime_current(inode)); inode_inc_iversion(inode); } EXPORT_SYMBOL_GPL(shmem_truncate_range); @@ -1224,7 +1224,7 @@ static int shmem_setattr(struct mnt_idmap *idmap, if (!error && update_ctime) { inode_set_ctime_current(inode); if (update_mtime) - inode->i_mtime = inode_get_ctime(inode); + inode_set_mtime_to_ts(inode, inode_get_ctime(inode)); inode_inc_iversion(inode); } return error; @@ -2455,7 +2455,7 @@ static struct inode *__shmem_get_inode(struct mnt_idmap *idmap, inode->i_ino = ino; inode_init_owner(idmap, inode, dir, mode); inode->i_blocks = 0; - inode->i_atime = inode->i_mtime = inode_set_ctime_current(inode); + simple_inode_init_ts(inode); inode->i_generation = get_random_u32(); info = SHMEM_I(inode); memset(info, 0, (char *)inode - (char *)info); @@ -2463,7 +2463,7 @@ static struct inode *__shmem_get_inode(struct mnt_idmap *idmap, atomic_set(&info->stop_eviction, 0); info->seals = F_SEAL_SEAL; info->flags = flags & VM_NORESERVE; - info->i_crtime = inode->i_mtime; + info->i_crtime = inode_get_mtime(inode); info->fsflags = (dir == NULL) ? 0 : SHMEM_I(dir)->fsflags & SHMEM_FL_INHERITED; if (info->fsflags) @@ -3229,7 +3229,7 @@ shmem_mknod(struct mnt_idmap *idmap, struct inode *dir, goto out_iput; dir->i_size += BOGO_DIRENT_SIZE; - dir->i_mtime = inode_set_ctime_current(dir); + inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir)); inode_inc_iversion(dir); d_instantiate(dentry, inode); dget(dentry); /* Extra count - pin the dentry in core */ @@ -3318,8 +3318,8 @@ static int shmem_link(struct dentry *old_dentry, struct inode *dir, struct dentr } dir->i_size += BOGO_DIRENT_SIZE; - dir->i_mtime = inode_set_ctime_to_ts(dir, - inode_set_ctime_current(inode)); + inode_set_mtime_to_ts(dir, + inode_set_ctime_to_ts(dir, inode_set_ctime_current(inode))); inode_inc_iversion(dir); inc_nlink(inode); ihold(inode); /* New dentry reference */ @@ -3339,8 +3339,8 @@ static int shmem_unlink(struct inode *dir, struct dentry *dentry) simple_offset_remove(shmem_get_offset_ctx(dir), dentry); dir->i_size -= BOGO_DIRENT_SIZE; - dir->i_mtime = inode_set_ctime_to_ts(dir, - inode_set_ctime_current(inode)); + inode_set_mtime_to_ts(dir, + inode_set_ctime_to_ts(dir, inode_set_ctime_current(inode))); inode_inc_iversion(dir); drop_nlink(inode); dput(dentry); /* Undo the count from "create" - this does all the work */ @@ -3488,7 +3488,7 @@ static int shmem_symlink(struct mnt_idmap *idmap, struct inode *dir, folio_put(folio); } dir->i_size += BOGO_DIRENT_SIZE; - dir->i_mtime = inode_set_ctime_current(dir); + inode_set_mtime_to_ts(dir, inode_set_ctime_current(dir)); inode_inc_iversion(dir); d_instantiate(dentry, inode); dget(dentry); From patchwork Thu Sep 28 11:05:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 13402655 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 944F4E732C1 for ; Thu, 28 Sep 2023 11:06:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 333238D00AA; Thu, 28 Sep 2023 07:06:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2E2FE8D0038; Thu, 28 Sep 2023 07:06:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 136358D00AA; Thu, 28 Sep 2023 07:06:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 03F358D0038 for ; Thu, 28 Sep 2023 07:06:15 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id D2787A0B38 for ; Thu, 28 Sep 2023 11:06:14 +0000 (UTC) X-FDA: 81285727068.08.719BA1F Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf21.hostedemail.com (Postfix) with ESMTP id 1A48A1C001C for ; Thu, 28 Sep 2023 11:06:12 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=V+wOzFnc; spf=pass (imf21.hostedemail.com: domain of jlayton@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=jlayton@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695899173; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=f+579iacD2RSgWVCKH/CfEZa/lD9il6pqmO8eji8PO0=; b=u2OgUvWxAG4OAf6G2q6/dIAyvieNxDmhET0HFlR+w1IQ5Z8zbLiPr8mD4mquqfWEE1LH91 X4uW8mN7bVFFzGEjzGr6pA1lgZWRLJK0kvOnWhu1eSdC0V14S8UeLVD9Okxfjj4I+GEjag rGSKAtLdkqLHYEwPQ5QeqkNmGhVpKgk= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=V+wOzFnc; spf=pass (imf21.hostedemail.com: domain of jlayton@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=jlayton@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695899173; a=rsa-sha256; cv=none; b=vrJx2LxKDqONzbuZZPV1SaDUTUxSPuMGy0432AXLrgt1lvejHy/QtWQdMozVF8kR1bTffK LFcVctPBJjL2QHKoWflNt42p1ACcNJmVaBI4AX3lWAu3YhZp3Nn3RCVX94mNwQUgHXaV0o ZOpGUPU9TkMZB+B1/cvwPjz5IqVre1o= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by ams.source.kernel.org (Postfix) with ESMTP id 69215B81BB2; Thu, 28 Sep 2023 11:06:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4B45DC433C8; Thu, 28 Sep 2023 11:05:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1695899170; bh=AhfBjRw4Zieo7d/UWgS6g+DDX4jTgfxPdqjByEx9qhM=; h=From:To:Cc:Subject:Date:From; b=V+wOzFncXPhDXQFQdHny1CsSK9qUJSENwQ3KCibIzAaql9xTx9HnhDcijW4/7BOtC kszW/YDyA0AMr7XQAUyJiZeb60fme2uDkyobxKoT8cY6VhZHy5eoMPnsaN6X7TtxCq QTaef29MEouz7MkE+tPPdhmCepxFcMdSgkZxMJFkcJInXSuCSMx/JWDM3dr1kZYemo enoSOcU6aqdkN9wSvXmqf6Z9xnaErzYq51O9jQbKnwkBY5wjm/kE01rgGkYxHItLa5 5cRJCieL6/r3mfMz8yZQYtWkWaXM39nIwleCYU584hrkq3VtvO021SVUVEZ1qpwd4S nSI/tWahGoeXg== From: Jeff Layton To: Alexander Viro , Christian Brauner , Linus Torvalds , David Sterba , Amir Goldstein , Theodore Ts'o , Eric Biederman , Kees Cook , Jeremy Kerr , Arnd Bergmann , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Greg Kroah-Hartman , =?utf-8?q?Arve_Hj=C3=B8nne?= =?utf-8?q?v=C3=A5g?= , Todd Kjos , Martijn Coenen , Joel Fernandes , Carlos Llamas , Suren Baghdasaryan , Mattia Dongili , Dennis Dalessandro , Jason Gunthorpe , Leon Romanovsky , Brad Warrum , Ritu Agarwal , Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Mark Gross , Jiri Slaby , Eric Van Hensbergen , Latchesar Ionkov , Dominique Martinet , Christian Schoenebeck , David Sterba , David Howells , Marc Dionne , Ian Kent , Luis de Bethencourt , Salah Triki , "Tigran A. Aivazian" , Chris Mason , Josef Bacik , Xiubo Li , Ilya Dryomov , Jan Harkes , coda@cs.cmu.edu, Joel Becker , Christoph Hellwig , Nicolas Pitre , "Rafael J. Wysocki" , Ard Biesheuvel , Gao Xiang , Chao Yu , Yue Hu , Jeffle Xu , Namjae Jeon , Sungjong Seo , Jan Kara , Andreas Dilger , Jaegeuk Kim , OGAWA Hirofumi , Christoph Hellwig , Miklos Szeredi , Bob Peterson , Andreas Gruenbacher , Richard Weinberger , Anton Ivanov , Johannes Berg , Mikulas Patocka , Mike Kravetz , Muchun Song , Jan Kara , David Woodhouse , Dave Kleikamp , Tejun Heo , Trond Myklebust , Anna Schumaker , Chuck Lever , Neil Brown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Ryusuke Konishi , Anton Altaparmakov , Konstantin Komarov , Mark Fasheh , Joseph Qi , Bob Copeland , Mike Marshall , Martin Brandenburg , Luis Chamberlain , Iurii Zaikin , Tony Luck , "Guilherme G. Piccoli" , Anders Larsen , Steve French , Paulo Alcantara , Ronnie Sahlberg , Shyam Prasad N , Sergey Senozhatsky , Phillip Lougher , Steven Rostedt , Masami Hiramatsu , Evgeniy Dushistov , Chandan Babu R , "Darrick J. Wong" , Damien Le Moal , Naohiro Aota , Johannes Thumshirn , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Hugh Dickins , Andrew Morton , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , John Johansen , Paul Moore , James Morris , "Serge E. Hallyn" , Stephen Smalley , Eric Paris Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-rdma@vger.kernel.org, linux-serial@vger.kernel.org, linux-usb@vger.kernel.org, v9fs@lists.linux.dev, linux-afs@lists.infradead.org, autofs@vger.kernel.org, linux-btrfs@vger.kernel.org, ceph-devel@vger.kernel.org, codalist@coda.cs.cmu.edu, linux-efi@vger.kernel.org, linux-erofs@lists.ozlabs.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, gfs2@lists.linux.dev, linux-um@lists.infradead.org, linux-mtd@lists.infradead.org, jfs-discussion@lists.sourceforge.net, linux-nfs@vger.kernel.org, linux-nilfs@vger.kernel.org, linux-ntfs-dev@lists.sourceforge.net, ntfs3@lists.linux.dev, ocfs2-devel@lists.linux.dev, linux-karma-devel@lists.sourceforge.net, devel@lists.orangefs.org, linux-unionfs@vger.kernel.org, linux-hardening@vger.kernel.org, reiserfs-devel@vger.kernel.org, linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-trace-kernel@vger.kernel.org, linux-xfs@vger.kernel.org, bpf@vger.kernel.org, netdev@vger.kernel.org, apparmor@lists.ubuntu.com, linux-security-module@vger.kernel.org, selinux@vger.kernel.org Subject: [PATCH 85/87] fs: rename i_atime and i_mtime fields to __i_atime and __i_mtime Date: Thu, 28 Sep 2023 07:05:52 -0400 Message-ID: <20230928110554.34758-1-jlayton@kernel.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Rspamd-Queue-Id: 1A48A1C001C X-Rspam-User: X-Stat-Signature: bi8eo1q3e9jydsiuyfsdyiefra4enmhj X-Rspamd-Server: rspam01 X-HE-Tag: 1695899172-303356 X-HE-Meta: U2FsdGVkX19XMOlWlpDjsDcBrm+mZvEcc710U5uj48DyhTJAEX2hIZsajw+hf+fZgupt+Br34aJ++LCGs4nqTZHvSLGApnStjTk2NvknL4OehZsHW/ji+0KetY09ghBmEaY9OZ5go/f022PhnXO2ZT59cjju/fiiIPBvaJOWYo9Pj4AtM0CKrkylNJs5Cs+myDcrI2uTsuZz7qgCLoOlbdIq1AyQcHG6qhYVeR7HpWAFgeIo5BO5We76IRFTOmFofVJUgIgWfWkXWd1OLFOyi/EoJdR9lGcU8v6te+ZKH+XHuDENVVCnjg7EHZt6HhE7S6ZnJPUIMXV9/HDVavyRFUttb1nD3Q66bugEvOW8Svz5ttpyFPFfiHxQy50DXzh20S7xTfzzgkcb+ruXaQhB9PL4CMI/A3EuwajxFdFYMv74VHi2rojyZk7UmrufrV3LUIPOUWNnw/+ICxKP4AEY7b+NmmbFSyt1SmVkzo8ouUbvRPslqXREbtmNrtt83eAoGxDY/bCJuwLVNMSDcUN1R8q0IKJHA8eVIExdyWOrepSxuJhUajtMcUgJVuUi0wP+MqLSCR78u7GXH5MEBlsDPolLPNtmRGsnlhZHidqXvlH7dVLQWH959pv7g2hl84+D93zsFpaOSECFbDC2dylBfIIalhHLRUEP9rfCP4IQdfr4cdmPRF/an0s8uU7Rr5yiSfVliRinP5KD3YA00BbIyeF497KMm5IYMbhfwP7Fv6iJdvDqEYa3SsF4yY4JkAAO/pw3O1ygS+B7g4J6S02TdYBksd7S0h/x07uS+SBCNuK0+9aUMzo8aUPTenN5bCXvlpAldOkOry6d0x4Uq6MUiV9G0Ryjb9Ylc5nCvP9KTkilx8Gc5XFu8MNa4hVaM3nIkOBPX1GHtYAFGev4aevwGiCDN2y/mHzMqp9pNJf0aOzsQw5QgzUXZ926krguEddevd5UALjIYRluqA8Fdnm Mld/bjkG xziIUf9Bua3yiudWHr/NQC3h3KI445zAtl9lqvoLWSWM89KbqNPZgX+7zErOUTqv3hEfnBTv4T4QX5V6lW4+hTUrUKlNgt3QnO6rOcj7LHoWnIm4ujw2cPNgzIBKAKZVSeqK/T2tvqRcm2Q1PhrfrLihcbVhAQ2Z+UskbYinMCiKyJo1FjtPzNy6XmVUBswtnhfMLiNdSS0bxI4G9BfPuI/F3/fdsil/cbx3c2lZ2j6LUQuFK2qicqlBdX/gXO5aEN/q6vw+6KHPeVsRTCx9iIrusrYJijfnvGzs7KhuG2mXsGxQKr0s0y6qcFQyd131wMGuT3mZ9L/ogPSp6Zif65AVAYYwk+EgFhk817XLLesetDEhvQFo9M5P2RpNipnx48ruIXQHG0vZ+9IVST85FsgnziX0IWnkHI68uxc3M60L4QToYVFKyAZVoJxUWA/SvvDoJzZBc2qJzvE6hUUaKkZCwYKZswUTfM5qi9JBRTdBKwtOfRrpepaLNka7e9ugt5Dr0/2EYnWFGwxWGaA3BVjOtxWmFLmvQgiBn9tME6nqTr/jf0gHNMlqgo8WBkKieOsozUfXEs2kgBZx7Zx77aeBtxJqK4SL1h6O7K2Zej9/8qEigVGOcPb6oCwYfZQbCjIBVasWHaIsNEfC6diT5ffL22YlWyG0F14uIy19JTUSW91ECYbRC0+cURcb7GerLBuAOjqMVobL5BbPlcdj4pNRd3lKW9j6vAh2ypjFyItpS+aUy75U1/RWBw3sM/mugDly/UpumpPL/5LtsA5ThMNdUezQBWRBg3zdfGVfQ6oeqrM1JXjuMGTMY60ad7YUHBruYPKYD/wJ+sa5lHpGDbeVxwoHSzYorlyO7ukru3Ya5gHvslInake75FhwquN81KNpAR+haN8g45mLZH4zt9D03P48vP4ZR/WK3R5mpZAcD/koQVV+F2mgyRhOeASkZBWy7AeBoC0JrFwCFNWOSf11PNL84 Bjy6jmUA 3Ml631cfjc+OEd8PwKu6NCcIiSsiFDm8c5crHHs4sFUg5Rm3aozOolpOFatrC9nudtlgPQFZXweys7h8NbVnqWFWFRG692eSbVw0k0xTljodhplDp4MwvM0ry7q2WrD4Sc/jG8PPrxlw+FIdNC6NUk00lffXoI0yDaUBtnqLP7FzXGVUhgtO+oULc4up/cofrwXU5Hf+pzpFDuu/NErHcpV/X7sPrbSgV1TIr/y/1OIUq8lT8JgK55vvbZxXa8x7Q9LLyGdCpve6bLzEBdvmP7GnXOYk2DuJRPqGC4NnZLxL0RIVhqzxO3SGcdgQ7RNNaUJxasX1L0FWh/2syq1D11/kDgQzsBbJUgqyxaD28gNnLZGjuIlPZqnGZ56QujsrGCtvUgIB4p1Nac13z7XLXbnN67jMgB18NtwLul74k3ndHCvkPIOWKtDFMXBuVxEJ0aiFRnYoDUZ8SY99Phr8bcL4qyGpI9Tj75aFztDXTZV9PHxqpkuwzS06wj7AmJKJI/5imCxPEUHZO33Jzx5rIEXRF1imU2JHKrCaoVuHxOk9qasdZ4xmfMZn9Q/7KXZIj8EefkYYo/X39bR7ZDbuQom66HNktWChvSbrg5+YAUdq2yR2ttSPhqLZylgOVHvpBuzj9bse//bbxWZkKG/s1C3NOpCqhI46aBOeCtkEiQ65oQ/laN9Qhpm/88/EMl4ZnB9q4siokcQq6M/KASYvw2pHBHKjxTVg7mbLwv7f6PUFTr0tyJQ0okYrM7j5GgyMquqvzC9Oh6nNVAclhrU8AgUcnfbX1uQ79KxRIJr6ZrwcIGfN0YOAcNG/3L8qib2AukKspAZ+y3d+mx8cg9NhwuIbKX3x86Xc01T2LlU352rDf6xKIRD/Ixdk+Rh/k5p67NyMgDV4v+V34eMvGtWz2KhHlrq+dIBN+xhcmW+5dTcw9NLTEedrNkzpS0hGeUF+HFIMoQo1JN0iM99BT5Sc0jAl2LcUk xykJYqtQ dn7DYXXLtWmjvkKCOtR+u+v3gF6U5Q8wvt4N5SoyxzGuYrvssvInASZ1+6/1UGw87KN4QyE0jpTQtkpUPMo2mGBG0pI7InXd8jBLikieog0Bs2vwCgzFV9cEv1DR3dWv6jshF72N9gPPntc5UN81bmOKPWpipRGFjgEkE7le6TMKc4+aYFN8iD5n7a4SkndXasldQpYdwe6BR3A6m+wRoccPTRFNx7A17dc+wHkZo7ra2XUd7GTsxC/JAZQygWD0j7UXMvHf1UvGuwdIPbbPhp16qR9C1aJuaZd5ORTz8d1wze+2NFF9fGDcU4ZtQh04AkQkmPuRTGvOJxH3eNlNN3FCpzuHNEYiVOmhvej5X7L5yY1wk300PZ0FG/TOcur2/klW3CWM3SkIg/F2qZqrQsv7hFaRolrCWduLEl/l2Dia2caqNtLIa6fLRTX/nPgcXQHM+xFpXTlgAP3YlTfX1Q5vrbWpibuNws3RTmnB9hDSBBHiC3OFpcMeqh8jGk20LptVYWa8qzujAgCvGs8ecRCU7PqGSoPA4byPIORjuqFbr9eomatmBJ9IbydkVjFzotS5dBnRfbxUNunIphjRbkgVRJZa5Jrg/3XjDOoEDGlhn1k9Nno2Yi6FQTPdGnqP+YZpKaFc1Z2jqlH5LdaotrRcmCucqZLqZdelEBU5t2KywuDcgNQNkz0Wcpvf/zg2AjxZ4tHjc5XgwFNcKQ9EiFX1qAb3kTdY1geAiz7ZtHNdkxv+PrI6RQPkamwlPhidKt1Z8shHEnjd8dQAFauZixxXO+wqT2deQWU2n83beGeY+1Um54JgbuwgWGtxvTzr4/dva4Ru7iZHeGRqpo3I5B4sqQ/cdN0kBxtZOIypV1H7Wrxd3sOjG6xRCbu3k8jjuMz0uJDFNUODuESA05FTDfnZEnwTVUYLMmhccEDtbiFHtEXfBUxKlT1HsEDL4BF2T/kz3WuS2Dyv1oC+yQD34EaY4JHB3 iw0kbof3 PEHGDv9rADQqPOvX1mHI3A+Jv+kcGkXrOMbn37N8maLQgNoBPYD+8xAu6GBaWR+dtXDRErDSErjO5UNEaKtN1zo8MrYjEWiwoQRvT96f2OhfNopNlSmwnnZz/uHN9D9PEO7Eqs8TcS3j3SMbUzg+XgyBjNs0ftOayCLH8KfaMYlRfm3SHlpGJvvY73AAFMTg6+0Qi7HNQDqhGMGt0WuMX+3JKVkLCdVe27S83FUM4Jxh5QqaKkGMa/a4i/eGqUmqrudZxKbERUeQhxV4ZqyyZE7uDfcSyeFuh5nRdZgrTW9QmsotVHSroYo9ls3eKHQ8eTiqwGYN5CV4rh5vX1vrIjO8OM/tnKFGFgqDfUNsSWnsyLiVsA/rwnf2WEJMLLtrUia9AEvdSbCXgHUVT9T7Tg X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Make it clear that these fields are private now, and that the accessors should be used instead. Signed-off-by: Jeff Layton --- include/linux/fs.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/include/linux/fs.h b/include/linux/fs.h index 12d247b82aa0..831657011036 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -671,9 +671,9 @@ struct inode { }; dev_t i_rdev; loff_t i_size; - struct timespec64 i_atime; - struct timespec64 i_mtime; - struct timespec64 __i_ctime; /* use inode_*_ctime accessors! */ + struct timespec64 __i_atime; /* use inode_*_atime accessors */ + struct timespec64 __i_mtime; /* use inode_*_mtime accessors */ + struct timespec64 __i_ctime; /* use inode_*_ctime accessors */ spinlock_t i_lock; /* i_blocks, i_bytes, maybe i_size */ unsigned short i_bytes; u8 i_blkbits; @@ -1555,13 +1555,13 @@ static inline struct timespec64 inode_set_ctime(struct inode *inode, static inline struct timespec64 inode_get_atime(const struct inode *inode) { - return inode->i_atime; + return inode->__i_atime; } static inline struct timespec64 inode_set_atime_to_ts(struct inode *inode, struct timespec64 ts) { - inode->i_atime = ts; + inode->__i_atime = ts; return ts; } @@ -1575,13 +1575,13 @@ static inline struct timespec64 inode_set_atime(struct inode *inode, static inline struct timespec64 inode_get_mtime(const struct inode *inode) { - return inode->i_mtime; + return inode->__i_mtime; } static inline struct timespec64 inode_set_mtime_to_ts(struct inode *inode, struct timespec64 ts) { - inode->i_mtime = ts; + inode->__i_mtime = ts; return ts; } From patchwork Thu Sep 28 11:05:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 13402656 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0C3AE732C1 for ; Thu, 28 Sep 2023 11:06:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6B6C48D00AB; Thu, 28 Sep 2023 07:06:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 665AC8D0038; Thu, 28 Sep 2023 07:06:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4B8988D00AB; Thu, 28 Sep 2023 07:06:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 3DB8C8D0038 for ; Thu, 28 Sep 2023 07:06:32 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 0E5EC1203F0 for ; Thu, 28 Sep 2023 11:06:32 +0000 (UTC) X-FDA: 81285727824.01.BAFB05D Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf01.hostedemail.com (Postfix) with ESMTP id B2F8440021 for ; Thu, 28 Sep 2023 11:06:29 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=bFxyq+wI; spf=pass (imf01.hostedemail.com: domain of jlayton@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=jlayton@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695899190; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=0YEv1V3zZSOHcgruK+mvOq6BiG3lZhaaQ3ES0cY6BjM=; b=6T/wx/MP8TJX0mRuknCJ0EBJEA+ZUjSTk6PJIE1wkzFnrmfjCV02TPPIBf6MMblJl67+s3 /u4RfsbL07DJTavSPs/BCd7bONwpYIKE6uGy4r25+qsStRYA6WOL6JOPYzesjuhGyAoxxj FqB2Pf9d6W60WCba0CICJV1OO0PYQ4U= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695899190; a=rsa-sha256; cv=none; b=fp+G/bp3H061SHOVJgT0JxVodjJtVNT0xkGGujG6Xq8EI7wam0w890TeiV8xYiLpUAiCwZ n5D4nmOf3bQPJVEto5FoPopRSPGiP2sjm+CO7XJzmi9AeVRp+X1YqjmfIpupXScDhssTOz XMuZbymccuYf+Z5U6p36fZ6kCW6L7Jo= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=bFxyq+wI; spf=pass (imf01.hostedemail.com: domain of jlayton@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=jlayton@kernel.org; dmarc=pass (policy=none) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 5B9D9CE1D1B; Thu, 28 Sep 2023 11:06:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 28B2DC07618; Thu, 28 Sep 2023 11:06:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1695899185; bh=EREGf1zcL5EA1z4Sr1OlKcRcr7XPDG3rng7QCUAKDtA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bFxyq+wI82J/WQ/3LWfsBekhh8OiaT2wYsSAjrDQk/NrGOURDgw5PWuMWCgk6npZ6 gYLI9nWuVeVxeze31PlhCET+PdMZY70Xy9a1ckPrunnaxH93RrMhwAf8QKEfxBAiMW A3cOqQLFufYccE9l6906MspLgdIVzFHYGgIdgAYxkIU2uPLpvYnElaoBbxLu/GOElz nfJ0kqX0lpMPX7fozYTYh3xQ6uUVAew7yxgjGjuRy8Oehoifs61PNFQPPpZBViM2G3 Q4xpsOM8kKsqE0iTJbEpoU+nreDJHiQfBK4Xqt/1AbCybTiYxp8gYPp3ucvOuJLoxK YlW0JpzEkcqqQ== From: Jeff Layton To: Alexander Viro , Christian Brauner , Linus Torvalds , David Sterba , Amir Goldstein , Theodore Ts'o , Eric Biederman , Kees Cook , Jeremy Kerr , Arnd Bergmann , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Greg Kroah-Hartman , =?utf-8?q?Arve_Hj=C3=B8nne?= =?utf-8?q?v=C3=A5g?= , Todd Kjos , Martijn Coenen , Joel Fernandes , Carlos Llamas , Suren Baghdasaryan , Mattia Dongili , Dennis Dalessandro , Jason Gunthorpe , Leon Romanovsky , Brad Warrum , Ritu Agarwal , Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Mark Gross , Jiri Slaby , Eric Van Hensbergen , Latchesar Ionkov , Dominique Martinet , Christian Schoenebeck , David Sterba , David Howells , Marc Dionne , Ian Kent , Luis de Bethencourt , Salah Triki , "Tigran A. Aivazian" , Chris Mason , Josef Bacik , Xiubo Li , Ilya Dryomov , Jan Harkes , coda@cs.cmu.edu, Joel Becker , Christoph Hellwig , Nicolas Pitre , "Rafael J. Wysocki" , Ard Biesheuvel , Gao Xiang , Chao Yu , Yue Hu , Jeffle Xu , Namjae Jeon , Sungjong Seo , Jan Kara , Andreas Dilger , Jaegeuk Kim , OGAWA Hirofumi , Christoph Hellwig , Miklos Szeredi , Bob Peterson , Andreas Gruenbacher , Richard Weinberger , Anton Ivanov , Johannes Berg , Mikulas Patocka , Mike Kravetz , Muchun Song , Jan Kara , David Woodhouse , Dave Kleikamp , Tejun Heo , Trond Myklebust , Anna Schumaker , Chuck Lever , Neil Brown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Ryusuke Konishi , Anton Altaparmakov , Konstantin Komarov , Mark Fasheh , Joseph Qi , Bob Copeland , Mike Marshall , Martin Brandenburg , Luis Chamberlain , Iurii Zaikin , Tony Luck , "Guilherme G. Piccoli" , Anders Larsen , Steve French , Paulo Alcantara , Ronnie Sahlberg , Shyam Prasad N , Sergey Senozhatsky , Phillip Lougher , Steven Rostedt , Masami Hiramatsu , Evgeniy Dushistov , Chandan Babu R , "Darrick J. Wong" , Damien Le Moal , Naohiro Aota , Johannes Thumshirn , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Hugh Dickins , Andrew Morton , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , John Johansen , Paul Moore , James Morris , "Serge E. Hallyn" , Stephen Smalley , Eric Paris Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-rdma@vger.kernel.org, linux-serial@vger.kernel.org, linux-usb@vger.kernel.org, v9fs@lists.linux.dev, linux-afs@lists.infradead.org, autofs@vger.kernel.org, linux-btrfs@vger.kernel.org, ceph-devel@vger.kernel.org, codalist@coda.cs.cmu.edu, linux-efi@vger.kernel.org, linux-erofs@lists.ozlabs.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, gfs2@lists.linux.dev, linux-um@lists.infradead.org, linux-mtd@lists.infradead.org, jfs-discussion@lists.sourceforge.net, linux-nfs@vger.kernel.org, linux-nilfs@vger.kernel.org, linux-ntfs-dev@lists.sourceforge.net, ntfs3@lists.linux.dev, ocfs2-devel@lists.linux.dev, linux-karma-devel@lists.sourceforge.net, devel@lists.orangefs.org, linux-unionfs@vger.kernel.org, linux-hardening@vger.kernel.org, reiserfs-devel@vger.kernel.org, linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-trace-kernel@vger.kernel.org, linux-xfs@vger.kernel.org, bpf@vger.kernel.org, netdev@vger.kernel.org, apparmor@lists.ubuntu.com, linux-security-module@vger.kernel.org, selinux@vger.kernel.org Subject: [PATCH 86/87] fs: switch timespec64 fields in inode to discrete integers Date: Thu, 28 Sep 2023 07:05:53 -0400 Message-ID: <20230928110554.34758-2-jlayton@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230928110554.34758-1-jlayton@kernel.org> References: <20230928110554.34758-1-jlayton@kernel.org> MIME-Version: 1.0 X-Stat-Signature: ct9p44heuhro3bp4459pcgijpgkkbzni X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: B2F8440021 X-Rspam-User: X-HE-Tag: 1695899189-62821 X-HE-Meta: U2FsdGVkX180MmZhmTglPWHhdrn1TOVrvIzJb43b2DKymhSBgntRn/f2gkYoPdxwm6RCJx3+APCX6pwDiRqjI9olWm1yMD2FmCTS3bsKi3w3kYNLIrJfLXVechtnijIXJxOGWr/QIyRicMAyZoLN82W+4Rir3soQmoRl18j7IjCAdY+sx+WpLhYRnwGc06nL9LsJIcjWrDOTLeQdWJYwN1Yrunvf+HjPWghUgiqO1FhGP0bB+FJQ3hGXimwuo7ocvoIUAvQMKfkWudiHQiCmujPUCyEOw6JJqodPM/kmZM13f0arqTfa96cYFxHCONt+CMRyVQh4d4w0JAAKRnQowwxFFeeVfmKr82jHd+s8jgJeXl9sanlnTyficCBc27XezmLp7JVtfyoNIPlZV4IOWgisDdDShEcw1ctlWw//yAwNmoKweJJU0fC889S+Ebb1SrVAtVEM+/WE2TMSblWK2Xs223WKle0w2eIr2qQuFqsuhZ9GPzmDpJTxBHpTObNDBqb5p2EDCjcV7jHZ0RK4QMFMmXUlkMhtjQxcWMx+RcJrYXUZqEtneA/UhijgMco36M91iD2Q7YV70IslHfahlETLxlwTSZnvVIGPVozcdQImx5tn9HzCGMp/n1uwLiV/+DbZ9qZXsTJRhj3CL++duICrR75YxdW+NtKv3HDoUzNKVEVy/8mzEwXKmdlZL8/3dvVN5PmwXvaj9r7aB9ArCP19eBE5XARYAXNeQc1ZV7h1E0/nr3W+Egr5H+oqSjFd3KFuhnlDNwM1vmZO1AVPfFyaY0wG65JXmwTCZeA4e0nbATsq48dFvVT1npOF/KkjU2885n0/sbqRX42k9bJbhqIjFwpVQOasfqYc06NCzBnZklLdLiQ9RaOfKFPXCWO7/G4uYBlsExMGzIlF1kV3gE6wJYmbVi3DE7YXmOdUPVy6pTnIBjvqY6chkSH90WWrepSXTQZAd7jjJgD7XCp de3aHj1x z4SRsaLdiELVjdUsBEwHympi/HYckGtBS/VY1uFUWkZoeHJQ4rD1hkksX6HZ8aGMbtVQiD0D1PkUEPLLqHP5vRZrIJDGSonrYkTN8Dvb/Urue+20QOgr0FpT7UxJCLhGRTc0FtumZrzH670q/jvdct7+SCo3nnrnmaU8R/+kn7IKUwJ7eq1LMaGOPzZtCN/j95dc76mOX2fRMQZzXFFZlbPjqboZwKcAnTf1rDl0Qec7vqQQh7HzHK8+7jRTAm/mN0T4ZYL421v5b4SEnJM9oH43lOxBkJrPY10jfoApTTBkttmJ9O3oC69L2o7SVbHHgV3sGJgy2XdWSuwfWHE43JEupZ3doUQHb9jkKaMTUONDGFpxS87lSKhRJI7z8vXsFDsMhogrqG6DU2cVvawA9wkRTFlZKBFYgKIRfp7Q+h/VFZhFEZM5yITea6vVoUqhPXPhme6af/wRsXNMlA87ppWcC5udd9y5lLH3Zcr3gF2pCxq6Na/0yV5bIQ0aDdb5+slEx4SxvLPHwHYSGX90wJUJoeseMXTq+ykEvwLVFRQVNRQ58X34M/sOHJOhZTYleGgXdtG23uoqdBBxvbnyGTfH/4Px1kuEL40GF6v2tOeHfI34QkpWUlQ+ZnUgC+CK3sH/YYBdk7kEqPxYcDYLRG3JhWVYtKQF1a6V8K2iSEA8vQC2CaXQh4wJyaDKaY8mc4qFMMB7NVlC9ommKVG3m+xY15cglaSVtmcOj3WrNIbEJ961o3PYXEOtmhgMZRvczMNcpywzBIH24J0TNxTG2OCdNq3qfKdUQ4PjsTtu1+0RrA0fCtELiUF4MVf/pNN08FDISeCuQ7PE2LYkDH/zzKeens38IBFNDNu4LDOELbJ2yFXIZH8p89b9e1gxL7nmzVrbpbmYfN4r+WrbeCmfnNkKlI6z+DqzQ2KdwrDDUH+OjNZmzu2QTM9GrofTZAOPxfQnwaaSEwxBD74sQ6zRghhjdTDCa r5hvc/z+ YhSCovBFuh4FIiWyqJS9G1F2nDsiak3jcGpIJpF1z2yz74FMJNZOmOhgAksVCjGzizmv25dRYfkd9P6U4S9BV2vtKQwVG7GYlykkRa7tYkp7sPnz8hZ4VJl4pWyryHs7ScDWPVll+chym+7pjtMOTNhIV3BhH0rKisjobhqJNk+mu3aURAzLQ1VF/6eDGw7LFkimsNxKnOQUjQGP+Fpu8Z99qSHE9i4CD8WktraJ2p4BhFA/TvZtx/P9zDz/NvT/FPDlRJvUj+LKaKQQY0ga647YZ+lpdocheoS3sFdtHujWLE1nWwvC4VJuTSnEdAXi2P9RhXOLqltUBn9m+xFO/q7Gd2BpoRiZrBtssryqsGFZmsBfcT5LIEE8/aXgTizajdC64yjwmolIxgzU9nSNtGjAM1UfREU+bCu0g054x/if51Pfrp1UUxFx9QhD5AG6Z9qF5PgujGO4SlfNodsqGtJYYGnxBbeXcoIQvoT0bNMR5iVat8gx31wLnbUv4xl3cf8noBDVuD8nPd26yXNeEKSiP4VKmTncKzxQM7UgXk/eOetqc19BpNR2bTGcMNY7m7zbWF/H9x1bvZ9JZZ5m42x++1t/rJASpByzY9Txz9LU4OPfNz5oST6bi07g2BPW4TzS942zWRP07feiZCc/lOk0cUWsAmSjnBwXuxff7poPgYmDqrBAETTKAPMMvsW7KK+o6+nCbyRRepGUFONcPomT04/NYD4B+o/aFeaov9/M1P6yIaca/gBy2DrXjM7ByDUb9jB2UQiTNUiLyiiqyVVSz1PwoaVq8GA0JqWxCxAR8/2W2zrVdABPc6Er92vI3WiRXicuRCA+mleX6V33K/FZl/0wCzhw7LfY9KddP3WQne/2ujyvHkyhdwNE9ZJCCIqrdkCoeaES/KUxUQG79nrtv9wUVr7lIufmHq+6eH3RMmklLbTluHDMT8jBr6HlqqVmxxUKm5QVe0eVhMXWXdroqhvI4 p1882dsB CDTST90Q3W+vQ44h91eEn/iYp76kpGEZLBXavmNO9hbTbt1RSArIEHslSL2w/r5vy9IQrHkO1klfOAbkaVEQIQVWsdCwIYIzawB0UR8oXPPTTGb8cBOrCv38ERMsc2y6HO4VzHm0Jz6SaA6BXEDT+RZB9bX6qzUEsXgj6IHkBXkQAfpfo2gZ94dxBgG/c14LVVU4Tn2givVq+Y2dGloKvOeDVaV3M9K2/JV7OUT2MgwJRx7a9rxUpbcjzjPLDQcGRSpROsVZHVoHrR0ZKLyQUAtK6RN97i6NC6kOcxgKJkiuEIAqeauP9Qto3mO/d67AtbYJB2zf93gG2RmWiYmVCHiKF2DRCwJL5/1FjF2dym52OTlNlg9Eu4F90PszAxxAp2FKhqj2BCQdHo5bNwd9nJkQvrlcZgdztrJdRWx3MARth3uu2+NL52HgnHYTIe/odRD1QTnlzPfmI4Sbrr//Np5rMRIJk5/xOIOPz8K2G1MBIlCCEvlBqJF8nUNDsW503RLpQnhD2hoTkY9yKfaTG4uCnIQ+pRYKrLE+dvfFC4cuKDqAzIl53BpRKv2k6BUSWPke2+745O5An8aofE+RaEpCoCSvCpIZimqECYSUrtJz0QBzrf+8CtSC/9Pwp5c8TJV5bPHTw5O3f010gC2rZimtpZkFLqoCA5L2YU2gKVsFRO24s+Id80gLBZrbGKD1l2foqC7txwba5mHjT/8u3RIugS8Gv9W+SW3Y2COkvjqhv7AyKIplm9Ig80udkF8n2fLCOr/1YvvSjaklLyEEYNGbIdMQsQgoOSn48tX/V2IQhKSRPp51Hx39bjqqMwh+O7yQluLYt9GS+PbmkbhEC3AVafJGZN5BSoVtNZf3K7kW9asMxziWBTuDU097BB+DjUB3XzbFm2ShZ2F5sdJOOi0i8nkn28BT4xQss4GATI51+UJdv71I0tzn0qNOlyeibOry8qH2shLbzP/h993RSi2KcaGU7 RiU37EKo cQzr+RuA63XDRMoTopIH//Tzq9JJMATubCMuxkiWRVXbyt08z6SsSC5uOUBMSqR8QP7v4b2EHH0x6uzgzBxFOPbHMybqWyTD+xCvluWkX9rf/xdgF/IQqzARvva4jAg1MHtpEt3iRF58ibDoLvWHCBxJB2p2PffHmNWx5jAFkciXeP6YnikUWwUbF6DUtaymzViSYgI6zpTUqBS7WHH1DWJ3Z12+7vTo83ZBpHw3DvJigqX4DAyENHQerNKfYB2bD76xzw4PNdc/p0YAlTN8Px7uTSEts0XUNZJfP7rA3tcJvR9S1zL6f1CQtpfR9gQPQWsN5foAOVPLyCJfA8SiGkG9768AUqQAw418xbsAHl4w== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: This shaves 8 bytes off struct inode, according to pahole. Signed-off-by: Jeff Layton --- include/linux/fs.h | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/include/linux/fs.h b/include/linux/fs.h index 831657011036..de902ff2938b 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -671,9 +671,12 @@ struct inode { }; dev_t i_rdev; loff_t i_size; - struct timespec64 __i_atime; /* use inode_*_atime accessors */ - struct timespec64 __i_mtime; /* use inode_*_mtime accessors */ - struct timespec64 __i_ctime; /* use inode_*_ctime accessors */ + time64_t i_atime_sec; + time64_t i_mtime_sec; + time64_t i_ctime_sec; + u32 i_atime_nsec; + u32 i_mtime_nsec; + u32 i_ctime_nsec; spinlock_t i_lock; /* i_blocks, i_bytes, maybe i_size */ unsigned short i_bytes; u8 i_blkbits; @@ -1519,7 +1522,9 @@ struct timespec64 inode_set_ctime_current(struct inode *inode); */ static inline struct timespec64 inode_get_ctime(const struct inode *inode) { - return inode->__i_ctime; + struct timespec64 ts = { .tv_sec = inode->i_ctime_sec, + .tv_nsec = inode->i_ctime_nsec }; + return ts; } /** @@ -1532,7 +1537,8 @@ static inline struct timespec64 inode_get_ctime(const struct inode *inode) static inline struct timespec64 inode_set_ctime_to_ts(struct inode *inode, struct timespec64 ts) { - inode->__i_ctime = ts; + inode->i_ctime_sec = ts.tv_sec; + inode->i_ctime_nsec = ts.tv_sec; return ts; } @@ -1555,13 +1561,17 @@ static inline struct timespec64 inode_set_ctime(struct inode *inode, static inline struct timespec64 inode_get_atime(const struct inode *inode) { - return inode->__i_atime; + struct timespec64 ts = { .tv_sec = inode->i_atime_sec, + .tv_nsec = inode->i_atime_nsec }; + + return ts; } static inline struct timespec64 inode_set_atime_to_ts(struct inode *inode, struct timespec64 ts) { - inode->__i_atime = ts; + inode->i_atime_sec = ts.tv_sec; + inode->i_atime_nsec = ts.tv_sec; return ts; } @@ -1575,13 +1585,17 @@ static inline struct timespec64 inode_set_atime(struct inode *inode, static inline struct timespec64 inode_get_mtime(const struct inode *inode) { - return inode->__i_mtime; + struct timespec64 ts = { .tv_sec = inode->i_mtime_sec, + .tv_nsec = inode->i_mtime_nsec }; + + return ts; } static inline struct timespec64 inode_set_mtime_to_ts(struct inode *inode, struct timespec64 ts) { - inode->__i_mtime = ts; + inode->i_atime_sec = ts.tv_sec; + inode->i_atime_nsec = ts.tv_sec; return ts; } From patchwork Thu Sep 28 11:05:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 13402657 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44C53E732C2 for ; Thu, 28 Sep 2023 11:06:45 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D6D128D00AC; Thu, 28 Sep 2023 07:06:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D1C578D0038; Thu, 28 Sep 2023 07:06:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B7BBF8D00AC; Thu, 28 Sep 2023 07:06:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id A90648D0038 for ; Thu, 28 Sep 2023 07:06:44 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 77F7FC0BC3 for ; Thu, 28 Sep 2023 11:06:44 +0000 (UTC) X-FDA: 81285728328.16.2175E1B Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf13.hostedemail.com (Postfix) with ESMTP id 93F2B20028 for ; Thu, 28 Sep 2023 11:06:42 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=LIvJMQV9; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf13.hostedemail.com: domain of jlayton@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=jlayton@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1695899202; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=AZYm+3IMy7PsScQJ1WtwjofEM45ISgwj290K5ddP3W4=; b=gotJAdYHhaVcFqFidV744W9Ij6eJy6mpQh8evCRFZolwH0ViKlLKxZ0DXBZWiOE5Bg/glc Nl7yZkFM2MTqJ6wJoxijakQeQW9GYZIVfafIXtqYiFgMxG+3zDBaZ7+8ZbUsPMTsINUP2Y 3yoph2uP6jVMnbQ1XoNE2AhwQjRCdGM= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=LIvJMQV9; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf13.hostedemail.com: domain of jlayton@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=jlayton@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1695899202; a=rsa-sha256; cv=none; b=xYCjvrInPFBJrjENPInZF+PAKpWyldWeptlX/hp48tqlZzkAl+FMi2Pys1W9EwRe5tyLwJ X6rNOkZfYhrmUBjosYzgsUa4hO+0ouRdwWXw+f3M4TAZCTQciiLMz4dHA0W3m+PrmTqUP0 +CfcOF4sRWJ8dGZY5GQMpeO3HXWkZDI= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by ams.source.kernel.org (Postfix) with ESMTP id 0FB05B81BBB; Thu, 28 Sep 2023 11:06:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EF540C4160E; Thu, 28 Sep 2023 11:06:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1695899200; bh=KcEb7Ur9VnfCswhdPaiHlW6A+8Un/231FkVSjN0vVmY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LIvJMQV9gV0uW8yl32NSd4yb2599TLMQSz3pZ7A8RvzTMK+/pPweiGT83QuRE6Ap1 RJ4tHrEtdELF24JEcAXBlbRxCLgD4fFKMvaVxDYJKFUi3JGR08fTlWqCpRUQLEU1eL PLdctIni/gLihdwFGrq6SVBHRpLIcoURicUh3JGLAt4t51ztAQPhDNYHtf1HHGTOrp XAB3XmZIrDME0ElXf57Dd8FtxB0Uiap7czp3ZlR45ObMUeHSnxd6fREH7G/U4RgfCh xv1/nw1L9/w3ErqEe74BXlZqblyXh/mVR1R03Etd6mg/RnXyu8EBj+lRYoEkTAJg+R yYzEQo7GNicAA== From: Jeff Layton To: Alexander Viro , Christian Brauner , Linus Torvalds , David Sterba , Amir Goldstein , Theodore Ts'o , Eric Biederman , Kees Cook , Jeremy Kerr , Arnd Bergmann , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Greg Kroah-Hartman , =?utf-8?q?Arve_Hj=C3=B8nne?= =?utf-8?q?v=C3=A5g?= , Todd Kjos , Martijn Coenen , Joel Fernandes , Carlos Llamas , Suren Baghdasaryan , Mattia Dongili , Dennis Dalessandro , Jason Gunthorpe , Leon Romanovsky , Brad Warrum , Ritu Agarwal , Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Mark Gross , Jiri Slaby , Eric Van Hensbergen , Latchesar Ionkov , Dominique Martinet , Christian Schoenebeck , David Sterba , David Howells , Marc Dionne , Ian Kent , Luis de Bethencourt , Salah Triki , "Tigran A. Aivazian" , Chris Mason , Josef Bacik , Xiubo Li , Ilya Dryomov , Jan Harkes , coda@cs.cmu.edu, Joel Becker , Christoph Hellwig , Nicolas Pitre , "Rafael J. Wysocki" , Ard Biesheuvel , Gao Xiang , Chao Yu , Yue Hu , Jeffle Xu , Namjae Jeon , Sungjong Seo , Jan Kara , Andreas Dilger , Jaegeuk Kim , OGAWA Hirofumi , Christoph Hellwig , Miklos Szeredi , Bob Peterson , Andreas Gruenbacher , Richard Weinberger , Anton Ivanov , Johannes Berg , Mikulas Patocka , Mike Kravetz , Muchun Song , Jan Kara , David Woodhouse , Dave Kleikamp , Tejun Heo , Trond Myklebust , Anna Schumaker , Chuck Lever , Neil Brown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Ryusuke Konishi , Anton Altaparmakov , Konstantin Komarov , Mark Fasheh , Joseph Qi , Bob Copeland , Mike Marshall , Martin Brandenburg , Luis Chamberlain , Iurii Zaikin , Tony Luck , "Guilherme G. Piccoli" , Anders Larsen , Steve French , Paulo Alcantara , Ronnie Sahlberg , Shyam Prasad N , Sergey Senozhatsky , Phillip Lougher , Steven Rostedt , Masami Hiramatsu , Evgeniy Dushistov , Chandan Babu R , "Darrick J. Wong" , Damien Le Moal , Naohiro Aota , Johannes Thumshirn , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Hugh Dickins , Andrew Morton , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , John Johansen , Paul Moore , James Morris , "Serge E. Hallyn" , Stephen Smalley , Eric Paris Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-rdma@vger.kernel.org, linux-serial@vger.kernel.org, linux-usb@vger.kernel.org, v9fs@lists.linux.dev, linux-afs@lists.infradead.org, autofs@vger.kernel.org, linux-btrfs@vger.kernel.org, ceph-devel@vger.kernel.org, codalist@coda.cs.cmu.edu, linux-efi@vger.kernel.org, linux-erofs@lists.ozlabs.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, gfs2@lists.linux.dev, linux-um@lists.infradead.org, linux-mtd@lists.infradead.org, jfs-discussion@lists.sourceforge.net, linux-nfs@vger.kernel.org, linux-nilfs@vger.kernel.org, linux-ntfs-dev@lists.sourceforge.net, ntfs3@lists.linux.dev, ocfs2-devel@lists.linux.dev, linux-karma-devel@lists.sourceforge.net, devel@lists.orangefs.org, linux-unionfs@vger.kernel.org, linux-hardening@vger.kernel.org, reiserfs-devel@vger.kernel.org, linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-trace-kernel@vger.kernel.org, linux-xfs@vger.kernel.org, bpf@vger.kernel.org, netdev@vger.kernel.org, apparmor@lists.ubuntu.com, linux-security-module@vger.kernel.org, selinux@vger.kernel.org Subject: [PATCH 87/87] fs: move i_blocks up a few places in struct inode Date: Thu, 28 Sep 2023 07:05:54 -0400 Message-ID: <20230928110554.34758-3-jlayton@kernel.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230928110554.34758-1-jlayton@kernel.org> References: <20230928110554.34758-1-jlayton@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 93F2B20028 X-Stat-Signature: uu6txkx5p7918e4xsbep6d38qie7raox X-Rspam-User: X-HE-Tag: 1695899202-112605 X-HE-Meta: U2FsdGVkX1+ViPkNFJWcEMBjm4hlpCdcgxarut5VWrpOBHthzVQI3+p00FfSaiqvBPuSQmP5rJMllQcvJ8kx/3NEFEa2gKUVSdG+0i5RsvgV5bQwfudjWYlujKAE29GtoODtvkR9cIBP91UN5zrv0531MT7ledm1tDr7aIf/0dqCxvrNG5xHYVimnEoRbp35XHvXeD2yNk1fKHO6zcyhwwULlQJCR+2PfqlOArytSxB76QNnkJ4Gv00s49OheG66v1m7NJTpdiDeJTl+3lcHwQtMCWSHmgTI/aXgUAlHdiySyPwIlaDBSaGMLQa1QVnTW8L9DKk5v6XfTyLAkXvsgGarVxzNG8W84WLBH0BOSj5y4NwCaJVPW5RCC3dgr5+M13JOuLRjBqa8Z12r+Oc9kqalHxVXddGG1fQBZbS2mGYhsz9eAlW0hpViF16AqNgYRMHseHE5h9+McvAOXgErpZQ25e++1RBOBam/9jrrwB814gkAEXxP7EgLKooJ3psdVzIQt+K7qE6QL2d9j8Y2FQ1U3fc7DNK9iMYMnC5oaoFUnIKj4F/HINL83zzqjS4hRcWRR4yccuqyXIWxr0ytjaykhHiaQHp6uZie4QKj68sDRW8ecYyT49T1XIcDGj/kha0K/VFzAaFWpr7nifYWVPz5VyvCq9qlZjVsTtKexRV+iwH/YTsHOujfMrwrkZtgUQ/RlnutnLMqqsNWjbsEPWtuHp2FVuLOPMdHgqjI5ewJIKKIG165rgVcsLmmFsJgB5ehE8z3zfWaPIOsnyxN57aO2QnqK1OKX9GJ+vnUwoGjpmGAosCfEierOACLudEJLVs6hSyW6IhjDI28S7Zt0Ja1VA8KKgjL/baDBI2FACzvGKHnN85+Zu56oPfBMa3r8LROABhVxmhVNHLgTd/q2adqgaPMmCOmukSN+uLpESrLB3YzJ8ZaOu45V1Fb7qRH3wqeGehifGMHwxhTDis xGby7m5f OuM/WJYIOddsQv2YWxce3xn722cZYHiJaVP1CtU1GHGFIukUnJyIZsbLhM1URh82ImDOmv/R8pVFcg1iOQMpLRTbgERk9KR1PoEJWd/H9ybs+xtY6P+FMIFxO/9kCdA4CYoD0Uoux1xw1zIGktdPWQ6w1U7ZgVvVB3Q40AF+Q9yspJZ/kPdYopQtLroxzHmRPxuEOsPTMDqGnav7KTHdeOT76s0XmC5R2n6jb2vdetgUmQZ3RG/fAI7jnQnI78KXMW0B6nxvg39VyZque4phDlDqVIiRlgmXpXANimPsCRRQSla8c2D+8bD7P4D0+UX8DQS5txHb0MBXm0PN/4RFnMq3Cl4wKudaqhuPHuVV+afbsbugT6BylwR1Kb3cuDzLh/JT6UXmwkk5iPFkOmj6Pw1VK7O3mq4EOr+0oT0T6yHUI6FldVV/D0XSiclO2ir68euRUylxJeK2DWCBzBaf65ChhcFUcVPImE0WGaz8xbzuAdryoPzyF6Lo/UzkbaUPBW7H8QffuuzxlMCW7GGqg3QCejFEYAyPd/sAhTcmcUaWRAd4x49Ib3uLs/kEE3GDiHNzqBYjEcglEkozu5QYUpWp8u13AvYSX/sxgpa22c3DmRbXinIwANHOijvN1+RMES+hE8ZHmaO34f6yC6cvc9cjDvDZmfkWH4zS/PKQLVy8zeTt2u5wGGsnmPUsOYM5al4puvLXe/FXJTDkspfcDq3X2yceJD9bnN3TZ/FxiXOyOkJ0w4Zt/MTWpPoUPbu//uf/xpVuH1h8yPtbOGWRSV5saf2M2tKJRXwOTRYxu3HQ+Y4QJhH7cBehzYLl1Wt2FC26oh/2wYHW5ONsiqMvn1/qYw46SxtQk3YQKZ0IojcKhmSpMzGtUk/CWXFZCNLjqyj+Ed6QrhbrfqnHAH0JetbuwRvY833f1Yl8Z+mRJ1MIWE3OltE94z3aNb6xe3+KasQwaTF28bkmUw0sfg2fJr3gca5qc iRC2Kmsk jml0rYTpuvATCNNReYUDXFv3R8oDKukdDgoP9Z1aguDsiXcMYsQwx2o/atkOOZLUuT4OTv88nlRGdUH6JpPhvdeSYt+ZrEq6/9FiYcWPsN/2Vvi78NPfaKUiO6UxLqa7FMHI2gfEbNCGEJfD7kOmXnaPiZAWby6lMwStdlq1vJZF1vALLV2fiOkNUFYpY2ytz8y70Q8+7gBVotPlFcknMbcuqL++JQmVdpWJcapV0cT5uwwrm1iDCCXGAUi35lR562HZolGA8W81//rFWjzyQ7xE9NWuVsMSzy7Pq0O8TysTA04brbKjK/OfwXHVirQ2SeD/5xCrFytJF47lyBlpU9YA3QpOs4dwrWEc9L8n7L7D7Z3G6tBVUVD0Ogy5o9k+H4Qt7AngWAVtYEmWLI3JxQbipttHmMwxzIfmu3ZJJGEuZhESIMLG2digwYaGB9oRWNgUoqeUwSMiLfdp9LLadaSuj6BCs1c3CuSw8oLswJ4WS7vC5eozk08tqlktdJJyV/ECtl/FG4VmvhlUZ/1qu5/w+uqrWXCltdhqFbeOb7RN82krN9iyMSrGQyOLlJDkVP6F4h4ca1xO18LgRkY4xuMkT4A6X7jahrQLpPRe+6HfbKMGV8sA40XrIt1RWAkRwZy4YgV4p7cKLjd1jMEPfnwkcXuN/a6FR4soUtJ+f6PzHsY8OTkJXA8FLG60+gDrICI4JrU1D2GFVowMkCt4jLEER/PtcdWAe6FsvyMNWmOY5JxDdsLsSsW1EaZn9LuiSSAa2OOQFnz1jXG3vVycGKRzz9CfoNxHeujRHwfXYQ37GYs7QYaWVInjhHUK2IxmFv2m8v3tjcNmP2AgOLVeBjFmrW67v3In0dYb5Dquwx7Lam477tN9jqCHoQxi1J3Zc5vYcy2yN6JLb2nKKJcWV02TACH/Dv5K9Nfvqi05kLQlxRo8V+TfIVjs1B1ZyDH5incFITJ3/OzANuP5fA+gjp0J5DDIR x8JtiLbu K1bK4csDeqQ8xm3BzwfuTu1WU85ctfjTqu71V79YgpH09majE+VAekOS4ODyjnpVGI2WuGr663clTp4ii5HwFPz1wOjuTBW7mOxltjc63c9f/VJ+lQHwuClyNat4YF+TvQcpVpVYxHNsa2apEMxp6Y7H/4qVT4bMsqb6lcF8BWE6yaMoRlG9lt7sFlqRXFasajEsnrJEJJtRu2k5lauhAG9AdnEkOpWw7y9pEzOKrnGZn/8bPx1z9iWBHEAD21HPLWp9UNR+yWIU7AhOPt1S/EN/pdCbKGGlCG7YSexVxKTnuqctvt0yTLmhUqflyQ5VtR+OTdZcbGrq2N5tS2QFKPA4k97q6ZnUdMJmxSAbewVzRdGYMhA/emJbGi8A1D+OPab/eMgCQI09YrNwLkchefGMISBD7ntjfUZX71qt0gIeciuwnMchGs1v/q/6Goo2D3cRJQPoFydOPG9e2KjME3wTJTW+geioe/XMk1EsIy/GRFLa/8nDyJNgFqMFqz1h3gEwTrW9k23gw++TDnoZiWEuDkooCihNvqFxSz0z/32d0jN4hEfcTLFvBz4l2W5iJznQ7Y612fPy156JfX1zD/Y97zfkvEAUEzVxIFvsyMda7ZbAYBzbdbqY0SMdTY8CCbb93XGjrMPRLEwnwz/KIDDPTWSN1mvcmzG93hzf3k1kIHkTKMi1fAd4pqRkhkfyV1ilUE1Ci2SJ2+3XgU7+o9CXXF57EMaBNtJbGgZoCE+llnd6WvHFVABF0J4kDn0YKnmPpvdLjFBGw8o0xKgUFHECW0z46y0LbG8eVHuvsWrfgCJdWvUJi6FHxfdiIM9PdfDPz6Dg1ig89LRZthSZHjS7Sk2A4AbW2/u49WXSHOAQMWtY/d5L2TCk3I+3cY+hKOmABwSqbl7VeWxiRR/G2Db9CV2akz2dtXiy0ZR/7GkES4C0lwuSVfyFrqPqUy6rYSrNJ6b19Vu4CNZ0YbL6F+aohR6KB 86PeSV9k WCgfZwZf+PalhYiWmWrVuuBSCtopkE7Q3hBVCXy+fXW8FmWsFbVtRUvB1JSwIo3NQHGse6Ya2aMXLZlGWQhBU1Gfr/HUDFCYlfhxiBNrGbL8f6Uz2ULwMP0cDIdABHwR/NXsnerg1TqSINb0rTHMwaAUgQbo77uMgCQGvTGcWgKEBfzpGBhxk82ShuXa2+Gxbamqwxekcmvwu7OJmVox2p6LUQo1K0CUwFWEMnds5OltJq4Cfmr3A9Sqw8NgHr8CZZK38XmjPJ3QlPYXrgL5szPbXhDAUjtsj4ZaRPgVGLTo0rdJZbNFvzQh529wnpBVVUp7o5KGaffjRa6iktsIRgG7f7NiXA2+DVJ6bU9rRvH99Gk/bchwYSmMzXz7XKexWFv51ML9ZWZ8xMmfEHJdrM X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: The recent change to use discrete integers instead of struct timespec64 in struct inode shaved 8 bytes off of it, but it also moves the i_lock into the previous cacheline, away from the fields that it protects. Move i_blocks up above the i_lock, which moves the new 4 byte hole to just after the timestamps, without changing the size of the structure. Signed-off-by: Jeff Layton --- include/linux/fs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/fs.h b/include/linux/fs.h index de902ff2938b..3e0fe0f52e7c 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -677,11 +677,11 @@ struct inode { u32 i_atime_nsec; u32 i_mtime_nsec; u32 i_ctime_nsec; + blkcnt_t i_blocks; spinlock_t i_lock; /* i_blocks, i_bytes, maybe i_size */ unsigned short i_bytes; u8 i_blkbits; u8 i_write_hint; - blkcnt_t i_blocks; #ifdef __NEED_I_SIZE_ORDERED seqcount_t i_size_seqcount;