From mboxrd@z Thu Jan 1 00:00:00 1970 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]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id D2DFEFD8FCF for ; Thu, 26 Feb 2026 15:59:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 41D056B00F3; Thu, 26 Feb 2026 10:59:54 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3D1436B00F5; Thu, 26 Feb 2026 10:59:54 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 291CA6B00F6; Thu, 26 Feb 2026 10:59:54 -0500 (EST) 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 0F9A86B00F3 for ; Thu, 26 Feb 2026 10:59:54 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id BB45E1A02C9 for ; Thu, 26 Feb 2026 15:59:53 +0000 (UTC) X-FDA: 84487068666.22.E94CFD0 Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by imf08.hostedemail.com (Postfix) with ESMTP id F1513160011 for ; Thu, 26 Feb 2026 15:59:51 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ltBuCaFE; spf=pass (imf08.hostedemail.com: domain of jlayton@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=jlayton@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1772121592; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=fLYlAfCr7Wgwg8RdGI5wMtP38MakqNwQ+MvPQWIW2oc=; b=RQMZTSO2fOBrETt6kcdRuHsqM4RP7T9qeEgnVQnV/CoHfFr9UxEoPro+s1NCgwX8RKqRtr BTaFyR4sSuTBJ9ccn3v52cCN1xQ/hq2rpZLCvB67OTzUTatXxhahkxv0d+X0i2s5kgUaVE c9zGKOZ3mMNnG91YMmJ5X8AqgrIgqaI= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ltBuCaFE; spf=pass (imf08.hostedemail.com: domain of jlayton@kernel.org designates 172.105.4.254 as permitted sender) smtp.mailfrom=jlayton@kernel.org; dmarc=pass (policy=quarantine) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1772121592; a=rsa-sha256; cv=none; b=3v7V/K8UAjqVJcePbGpAVkSUdzY/tnCO78uWfWxp9l5OosB0fQdRU0iQgMVGH1FdUql6aA Ui7Mk06UcYn4RDHKt/VUU84z4TT8pBUL1m5bV2DjTwwKKUD7lodCDuKj3RhtgyBGg15cC8 foj5QJ5TdqtCquA0zx6PVl1qIU38T4U= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 2034A61118; Thu, 26 Feb 2026 15:59:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8D436C19424; Thu, 26 Feb 2026 15:59:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772121590; bh=VTT0KHR7BbAQYop9anH+bkuQB0B7NoPjk1NTpo2tzcg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ltBuCaFEtGvQHRlHx7pSUXMJvQ2xqMGVdp2WfZjMtqntvXbs73LaqWDDb/K9Ip4UM WRyGhv9Bh7nqFwL3Y9NEqAa9S+7r5/WaP+0M8Vtq5KWyHP7cOFpBHkYyuYEC0EkLdW RNeSDZSVjQrHEVPs3VNrgT5LhT3a5BD55uNYm+lN4FCpcHKGZ1Qvt1Wcv3HZsN4478 zMx7LgvHJGjHVaO7Jk1T3HnLLWhEenCFZPvOTaFwZ0oJiXZhe7F1QF8BVQXd7TOjF/ Xxal7t9LtS7+l05rnICV0YN5kkfsRFxBg4nMbOsdXU/klL1SbDKKEsFyTY8fGuJG7j 9adU9Gu3fkmRQ== From: Jeff Layton Date: Thu, 26 Feb 2026 10:55:19 -0500 Subject: [PATCH 17/61] nilfs2: update for u64 i_ino MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260226-iino-u64-v1-17-ccceff366db9@kernel.org> References: <20260226-iino-u64-v1-0-ccceff366db9@kernel.org> In-Reply-To: <20260226-iino-u64-v1-0-ccceff366db9@kernel.org> To: Alexander Viro , Christian Brauner , Jan Kara , Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Dan Williams , Matthew Wilcox , Eric Biggers , "Theodore Y. Ts'o" , Muchun Song , Oscar Salvador , David Hildenbrand , David Howells , Paulo Alcantara , Andreas Dilger , Jan Kara , Jaegeuk Kim , Chao Yu , Trond Myklebust , Anna Schumaker , Chuck Lever , NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Steve French , Ronnie Sahlberg , Shyam Prasad N , Bharath SM , Alexander Aring , Ryusuke Konishi , Viacheslav Dubeyko , Eric Van Hensbergen , Latchesar Ionkov , Dominique Martinet , Christian Schoenebeck , David Sterba , Marc Dionne , Ian Kent , Luis de Bethencourt , Salah Triki , "Tigran A. Aivazian" , Ilya Dryomov , Alex Markuze , Jan Harkes , coda@cs.cmu.edu, Nicolas Pitre , Tyler Hicks , Amir Goldstein , Christoph Hellwig , John Paul Adrian Glaubitz , Yangtao Li , Mikulas Patocka , David Woodhouse , Richard Weinberger , Dave Kleikamp , Konstantin Komarov , Mark Fasheh , Joel Becker , Joseph Qi , Mike Marshall , Martin Brandenburg , Miklos Szeredi , Anders Larsen , Zhihao Cheng , Damien Le Moal , Naohiro Aota , Johannes Thumshirn , John Johansen , Paul Moore , James Morris , "Serge E. Hallyn" , Mimi Zohar , Roberto Sassu , Dmitry Kasatkin , Eric Snowberg , Fan Wu , Stephen Smalley , Ondrej Mosnacek , Casey Schaufler , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Simona Vetter , Sumit Semwal , Eric Dumazet , Kuniyuki Iwashima , Paolo Abeni , Willem de Bruijn , "David S. Miller" , Jakub Kicinski , Simon Horman , Oleg Nesterov , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , James Clark , "Darrick J. Wong" , Martin Schiller Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, nvdimm@lists.linux.dev, fsverity@lists.linux.dev, linux-mm@kvack.org, netfs@lists.linux.dev, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-nfs@vger.kernel.org, linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-nilfs@vger.kernel.org, v9fs@lists.linux.dev, linux-afs@lists.infradead.org, autofs@vger.kernel.org, ceph-devel@vger.kernel.org, codalist@coda.cs.cmu.edu, ecryptfs@vger.kernel.org, linux-mtd@lists.infradead.org, jfs-discussion@lists.sourceforge.net, ntfs3@lists.linux.dev, ocfs2-devel@lists.linux.dev, devel@lists.orangefs.org, linux-unionfs@vger.kernel.org, apparmor@lists.ubuntu.com, linux-security-module@vger.kernel.org, linux-integrity@vger.kernel.org, selinux@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org, netdev@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-fscrypt@vger.kernel.org, linux-xfs@vger.kernel.org, linux-hams@vger.kernel.org, linux-x25@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=16417; i=jlayton@kernel.org; h=from:subject:message-id; bh=VTT0KHR7BbAQYop9anH+bkuQB0B7NoPjk1NTpo2tzcg=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBpoG0IK3Uiz7/OGLiZ1boS/yxgMZlT/xNxGiqhR FULecILsxaJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaaBtCAAKCRAADmhBGVaC FTQLD/9IPHA4Me/91ZDcjNOI16Cy7+JCps1N405Mt0z2eytOxfFlSuDruRvCwzNwPJfCKifLm0Y enWqScM5706EZSgSBIEQCzQ1MwJC1DhXN66P/KNVC7QasVMV3j/Dt0dTlzJcSxfG9HrgeAZjKlP rK8I4ZGcI56XctLmPip7GPreUU40toONLe9BHh0bJB0WrD0eMLONPAqobOZsA4jTxGT3zBS7Ke3 ifnQU1MlfIcght2gGch5jMKDto2dYZ4St0BVDjHAH5B77CeSa2fk9wobPM9AaQtPgH7oOZswn78 e9G1I0GdeLc31O7pPNcwiVdFccLIcK7vrMfjqrbOxE8Xy4AafjFwvyqH/XbwgGdUVvgX3/SsU38 9sXNl2wur+tE3cXzd9Eq61ZPpSMf9z5mEwuU9WbRKxkd0O5Zn5dtoDg4bJBkFm9GRXR1Ve4JTFX rMeFciaYCiQireLZ7neiQS0lCesWLXeE71w53juyXfd0udVQgOmJmnWaok6q/ggallPNp7aaD+x orBRW8dUEwPGWVkCC/crJ1ErfNUnT8ZGU+/RTxXTMDaZtFPL9O+pT+h7t9PYWQPWcYXCN+Fye45 4bS4Wb43IgUmfaIozc0AKQTbJitp/56x4fYxWAv8eFOdQuj8qXp0AqY3Nr+n7JQ1JfGxAOj6+io 7vFdF/gxNNtHu/g== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 X-Stat-Signature: 4r79ohd777868nggup8419cybccb6p5e X-Rspam-User: X-Rspamd-Queue-Id: F1513160011 X-Rspamd-Server: rspam01 X-HE-Tag: 1772121591-928071 X-HE-Meta: U2FsdGVkX1/VVu9WWA0PgL4j7QJW3GE4QF+7e++hblCuJtqbudsJQqe8JkTUP5yTB05zyZ6McufT9Rhef5fIzogAB0HMmTZ2Ejn/2WTnEEOj9qiKpIR196XG7/4suZZUijHD8VwgLWV52PsmU9+s3LD7qoylG3rPw3oXUhT/GMDXAIUzZaP01gzKqjnfcI/eGTbnesinKfHYUJXxiXsOrKfqbseO/NtlfqyOV5/uQNEEfX1YEy8FHerf7lGx4X5JKiFstKOtPvi8lEnRwNFcatPpnEDKtiUGLe1KuAVQkNIqmqsKLTkRKmLY8lyT4DztdUktz367h7OY8iq1pqgEjeiWajntxQg0Nh5FneUKhV/8DoQl35SYvMCFVXQJ2ZbkLNqYIw69pIEzW8BWBvP/OIX3dKK5x0/x5ofnc285V7m8VGu9FpNa5eTRuIe90RwMLuIvqAzgjhqNOzWK/1i9L+1uSdZaeXCXGcy2YQiNQ+/3eB3yvWI4ldwqfFDqikT39mE2n0r510NN+VZlVGTZDLPgTmM1hgGirvNVf6lxULs8AD17Dny4+f6IG5pUtGC81BbMH6g7g3wcyolVY/qYI8mFHi92zFJ+tKK0Wcacc7UIlNHwxQwOd4123e1mO5HVOD8XfelZXOQPXB7KbYif0DIikpPC8jWZeaeoPUB5rvIpZmCXB0D+73v8NmqkIKjkULnjfbAQ+4LFUSBdTMPTFJA+HsrnxHxae9xpgoaxw8PWCkYSSnDylH4yCqB4MaSemdXRr/01Ut8zPyahBsGfbqI18nbbSSev+xPKUxpuRUoCNIvFipjrKxYFvh4w6NkJJ16XkjCMTbLtvzgxcn5HYO+BKntLUiv2WA9gp9lDtpSiV5cunJXPyUnS+lPBti82AzGUvueK1SGWpzIHUIwbKPNMmOrWqURkWA6hlcFg32oIumsmyQegW3FdUVObib5oHI6AW3wksu6T4tyFnal 5DkqyDgp 5Jw7mQ4aXDFgfuwfkJIuupbn0k+BIxwEKb4uzkQuAjy4TzZ8AEO3ROfhPzdw3VfIvGNhwUdzu6eSVVPY0i7WvudCPCMeJ6vgB1Ax+fPGqUg9bMuVVc1XldOzBB/TlHc8sftwv6AGflq4xa94IC6cuS5Y6TPljheHF7z3AFMlF/ujmF0lbGlWe2PvSrApZn5y1Pp6evCDdfnV+Vzo17QTOJFouMCINCW9STWphUtQyxLcrIjLOcMz1KicrbIEA+Pu9xqY65jt7hp7BWzrLCI6u52HLRGYG8Aub2ZL6xZG/Gr4GdgAcLXpDZ+dBnhpW3Rrtnsei3B2JWEZaNNjnRWLVid2VgwdjRKK0eVmETJve6ouckGEh1MeaL133EuMvuBYEZmuYKT5chsBla0elV8og82jGe19b4vUM3J4fCoxDT3Eft3PHbA4AbIdc4ooedCameZuqPDydUivlWWo0pUyzKnbxhdgXqUKU3Xc2Y/3RPsMYrTqdY9xyyJ6ffuyKad6cKI3XKkq1rWfH7UiUC/UMz+GkxpOp4Q5MIie4hhhSsA2ZIgZRMacxPk+NBtD0oRlpK2vibGFgXFLyDSMNv8BlhGTLsknhoieV3WqBTq/sSaYxlJBCxKfm3qfo+VUvO9iDHjq/y2hk+kYs5CJtAzEOF3Ure39mO+4VfsI+zfeuT0sUmfub4IfO+Gk00v1QQoY2eZjhQmRQ0kaheZbFrZYlDVeOM0cOzAWkFsSlPb+wmkaH7MBbJKE4RlZVJyDoUqiUomCnzRI2NyeE5ZeexjSmoGZ2jXI+wNFrM1vCr63I+hgC3Az+rNRpoE5+hRdlKhkybhrQKIDmsWj1hhToMZHAcJWupCZwo1wz4XnofRiwEZW0hXUcF+SwrZmcpLpERwBOWSog6D7jl1JZIWifHeKAdU1lw8bkvy69IwgNBYdouT8ofMF5DuYdXZ3Xx2WG+M4K9nc41ucM9VnU0Zpsbt1GcSV9YOVW fLTxP9sv HewcgcpbSYi4Y0y+AS2PmmUiKPCmDKt/FaYD1u33s3AVj8kht45lKAfPAdyObCriIOfmRQgG6pTpRthkc5EXQ1j4TkuaTqhqT/OivuukKePt6OxdSZbPAiwH9G2OfIWeCQO6NAQNZ4MlThofo4HHxbj1DftcIn77BArj08Mcew4UeguYOPy0zEc/OTjE/77WSkgbIHkR86AbxpEa1tZ1NplCfLxZNnrHS3IV45cGqixkd/WFelFqEtHqIt2+qiwxeSVzaB/PszS6PbKxSl/On6g8C1RucJHf7CBYad3CTeCjoElcYkvbl/6glyILHAacJ50bnuaw3yC4oUeMlsC/oDxgBYi/zyti6yV/zyTmFfB7bZgdFZr1ioWgzLQYDlg9efzknis++Mfx3/gfKhwiCimtLWK0fM92Y6rp2l+HR55U/bf0W5bPdGmBQQDWpisGi/AII293mJftLb4PQiXb156XEBHAhyiV8IMkgdVp8ZonSqzmY9CsV1fXRRxJLr2btMIY5PpKSJqHU4PybCNdQSPzXDRU3bd8zu+X0EfHciVyAKKnGQaBtWsf4pciU/gTLDc9R4AlJ8fLpl8duQ9nVhbAUj9GG5LEw4sgR3ZuL4aZAzSrQWrZF4IEwcl5E821xsWUjxV02WiEwBFL4UFOtcB5UCEfOfRb4MPpPSkGJeKWzMkNp1XdxkeWcZZhmfY9APr1LZ3BCxSLFUjaIYyJ+pabpNF6CexpHvlM9s3bjYPxRHZfVb1lKngUy7qVg69lxoCDXfdlDXzKjoJXhiJjl1G68y+IC03S2Np2PuCcAQEh+p8im4Ukxh2JmUeKOYbJuMh46dF6hiBKnIS3hGGvPbrT+BMjBwxGgzwPC7NB3lG8jCey2Z32cID1hTzojA2uduwKEoQO1iHsAjjGIOdRuwl+SiblXcS7CpcaAvQJT7bspniKlKD46qm96CfUX/nQ/bRYBPtDms3YQqf4gw2Ack1B9RotP JwX7YSob mM4qocqumXoJKIoL4QUE78PbmzNx2dcJU2uys1GC1sFAi0TM4swlvIMaS0qZ1y3uH8C/XTZQW/bAmE2gqT5mR9xgcLlMj+vbod4kctaDf+2lPbigWsNNiiLmOv1FOnsqntSkNlvygqiygje4umBD/1K4aG3zblMRVpgPsPCwtWiwTog2mnA/qvxJgIwuR5xPpBwPblhUJG/VpvrLKpt8cfINYOm0wNIhgN9FVpTXyisrMQXFnT/Svss/14Tl+DRRNQsSyj+KUSr4Uu55TYJGGf08F21vXhm2BIkWGJqJfEoid1+emVtvzespIWt08Qd+SDEuGgnVenHzk5AxsBCcbEhqWOe8CVrmJqE6Kv9wh1ua3wQVIOajg0ORmyHUQ4LLkDYwc5sby1OQH6LL7vhHjgKlSNh+VyEoegy722KGUeiDX7roCUiluqNMl58jKIU9o3uLC9mRpgdH7U5WX4T78nZ1cgJZmJiubVflUENltSsqWZURkoFFWQsTVBdLhXMtDG6VaKPqKnO3hgTMHw1MZILRjaop+sw3qZ/oxntWmsgGA0vtFfJNA7jctv/JOuJ/nUGyQcQsfJyzkvrVRF4bovjZgIQlvZc3JbcWWLm/78I1/BIjZ7fBifdW5PmTfla3Nwh4NXy+baoJPt9vggyGGYe6KznPjzAm7G6dPXne+6SIjD3LeGd2SGWb7ggjTcQXZl1Uikk8zw6xgfpc1JuBy8exneAMEy034IUFjQAoCF95EwEET5uQtgqx5SHlNEQQQi4MXhuTCl7nWrrrt/puQ+fO2IWXMdIYHlFKWGDDfvSfayptK1R6XKiG1tDt1OZBX9DIiQOthRsm/99KF+jYam9CGc5jNlCQoMg2pocfT2+9sJfQd2WsIuavsk6XqhS+fsm+ITTC2V6sVTqAbMbtWG9VgpEHjPVHAjpcVzEfILjmUNPMc1Uixwx8rB8C2DFAGp7XRYMgmD1hOMZLhFYd6tmKIYdEc hx8Bh5xn SIFC4tBNceJWbesfo5uktVKjjL1lx7g47DT5+e1oBTws+SEPiz3x6+ZdAFDPkjH7B66d9+CVeu0czeVTGZJLlk2fHUSLKF/mrd7WvNVmpleyFS6Gn4oyqy7xmFTBaAg7VbO/wHDOsD7oaTB6p0ZqxKuv0E0O5lq/yhw5BsLN0wRQVWDH6+TfUhmxzHybMX0LsFTsAIkJehrM7nk+qB9CA/nV0ryWeH91Lsmq8W8NgDl5cUssAJkiHLFWIB+lP9Ps7MeHakaVds6tq0Ff6yeLN9HGjzfX6mksQBANBWOQZxsVKe61q193nsPDzQOyeZ0r3NuQx972dDU1oJYtAgR8H74VImAV4E5eIez6yFaLhAjJ7k+av/gvJ/3lJGlXE8o18FsgLhfntR+A== Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Update nilfs2 trace events and filesystem code for u64 i_ino: - Change __field(ino_t, ...) to __field(u64, ...) in trace events - Update format strings from %lu to %llu - Cast to (unsigned long long) in TP_printk Signed-off-by: Jeff Layton --- fs/nilfs2/alloc.c | 10 +++++----- fs/nilfs2/bmap.c | 2 +- fs/nilfs2/btnode.c | 2 +- fs/nilfs2/btree.c | 12 ++++++------ fs/nilfs2/dir.c | 12 ++++++------ fs/nilfs2/direct.c | 4 ++-- fs/nilfs2/gcinode.c | 2 +- fs/nilfs2/inode.c | 8 ++++---- fs/nilfs2/mdt.c | 2 +- fs/nilfs2/namei.c | 2 +- fs/nilfs2/segment.c | 2 +- include/trace/events/nilfs2.h | 12 ++++++------ 12 files changed, 35 insertions(+), 35 deletions(-) diff --git a/fs/nilfs2/alloc.c b/fs/nilfs2/alloc.c index e7eebb04f9a4080a39f17d4123e58ed7df6b2f4b..7b1cd2baefcf21e54f9260845b02c7c95c148c64 100644 --- a/fs/nilfs2/alloc.c +++ b/fs/nilfs2/alloc.c @@ -707,7 +707,7 @@ void nilfs_palloc_commit_free_entry(struct inode *inode, if (!nilfs_clear_bit_atomic(lock, group_offset, bitmap)) nilfs_warn(inode->i_sb, - "%s (ino=%lu): entry number %llu already freed", + "%s (ino=%llu): entry number %llu already freed", __func__, inode->i_ino, (unsigned long long)req->pr_entry_nr); else @@ -748,7 +748,7 @@ void nilfs_palloc_abort_alloc_entry(struct inode *inode, if (!nilfs_clear_bit_atomic(lock, group_offset, bitmap)) nilfs_warn(inode->i_sb, - "%s (ino=%lu): entry number %llu already freed", + "%s (ino=%llu): entry number %llu already freed", __func__, inode->i_ino, (unsigned long long)req->pr_entry_nr); else @@ -861,7 +861,7 @@ int nilfs_palloc_freev(struct inode *inode, __u64 *entry_nrs, size_t nitems) if (!nilfs_clear_bit_atomic(lock, group_offset, bitmap)) { nilfs_warn(inode->i_sb, - "%s (ino=%lu): entry number %llu already freed", + "%s (ino=%llu): entry number %llu already freed", __func__, inode->i_ino, (unsigned long long)entry_nrs[j]); } else { @@ -906,7 +906,7 @@ int nilfs_palloc_freev(struct inode *inode, __u64 *entry_nrs, size_t nitems) last_nrs[k]); if (ret && ret != -ENOENT) nilfs_warn(inode->i_sb, - "error %d deleting block that object (entry=%llu, ino=%lu) belongs to", + "error %d deleting block that object (entry=%llu, ino=%llu) belongs to", ret, (unsigned long long)last_nrs[k], inode->i_ino); } @@ -923,7 +923,7 @@ int nilfs_palloc_freev(struct inode *inode, __u64 *entry_nrs, size_t nitems) ret = nilfs_palloc_delete_bitmap_block(inode, group); if (ret && ret != -ENOENT) nilfs_warn(inode->i_sb, - "error %d deleting bitmap block of group=%lu, ino=%lu", + "error %d deleting bitmap block of group=%lu, ino=%llu", ret, group, inode->i_ino); } } diff --git a/fs/nilfs2/bmap.c b/fs/nilfs2/bmap.c index ccc1a7aa52d2064d56b826058554264c498d592f..824f2bd91c167965ec3a660202b6e6c5f1fe007e 100644 --- a/fs/nilfs2/bmap.c +++ b/fs/nilfs2/bmap.c @@ -33,7 +33,7 @@ static int nilfs_bmap_convert_error(struct nilfs_bmap *bmap, if (err == -EINVAL) { __nilfs_error(inode->i_sb, fname, - "broken bmap (inode number=%lu)", inode->i_ino); + "broken bmap (inode number=%llu)", inode->i_ino); err = -EIO; } return err; diff --git a/fs/nilfs2/btnode.c b/fs/nilfs2/btnode.c index 56836712909201775907483887e8a0022851bbec..2e553d698d0f3980de98fced415dfd819ddbca0a 100644 --- a/fs/nilfs2/btnode.c +++ b/fs/nilfs2/btnode.c @@ -64,7 +64,7 @@ nilfs_btnode_create_block(struct address_space *btnc, __u64 blocknr) * clearing of an abandoned b-tree node is missing somewhere). */ nilfs_error(inode->i_sb, - "state inconsistency probably due to duplicate use of b-tree node block address %llu (ino=%lu)", + "state inconsistency probably due to duplicate use of b-tree node block address %llu (ino=%llu)", (unsigned long long)blocknr, inode->i_ino); goto failed; } diff --git a/fs/nilfs2/btree.c b/fs/nilfs2/btree.c index dd0c8e560ef6a2c96515025321914e0d73f41144..3c03f5a741d144d22d1ffb5acf43a035e88c00dc 100644 --- a/fs/nilfs2/btree.c +++ b/fs/nilfs2/btree.c @@ -353,7 +353,7 @@ static int nilfs_btree_node_broken(const struct nilfs_btree_node *node, nchildren <= 0 || nchildren > NILFS_BTREE_NODE_NCHILDREN_MAX(size))) { nilfs_crit(inode->i_sb, - "bad btree node (ino=%lu, blocknr=%llu): level = %d, flags = 0x%x, nchildren = %d", + "bad btree node (ino=%llu, blocknr=%llu): level = %d, flags = 0x%x, nchildren = %d", inode->i_ino, (unsigned long long)blocknr, level, flags, nchildren); ret = 1; @@ -384,7 +384,7 @@ static int nilfs_btree_root_broken(const struct nilfs_btree_node *node, nchildren > NILFS_BTREE_ROOT_NCHILDREN_MAX || (nchildren == 0 && level > NILFS_BTREE_LEVEL_NODE_MIN))) { nilfs_crit(inode->i_sb, - "bad btree root (ino=%lu): level = %d, flags = 0x%x, nchildren = %d", + "bad btree root (ino=%llu): level = %d, flags = 0x%x, nchildren = %d", inode->i_ino, level, flags, nchildren); ret = 1; } @@ -453,7 +453,7 @@ static int nilfs_btree_bad_node(const struct nilfs_bmap *btree, if (unlikely(nilfs_btree_node_get_level(node) != level)) { dump_stack(); nilfs_crit(btree->b_inode->i_sb, - "btree level mismatch (ino=%lu): %d != %d", + "btree level mismatch (ino=%llu): %d != %d", btree->b_inode->i_ino, nilfs_btree_node_get_level(node), level); return 1; @@ -521,7 +521,7 @@ static int __nilfs_btree_get_block(const struct nilfs_bmap *btree, __u64 ptr, out_no_wait: if (!buffer_uptodate(bh)) { nilfs_err(btree->b_inode->i_sb, - "I/O error reading b-tree node block (ino=%lu, blocknr=%llu)", + "I/O error reading b-tree node block (ino=%llu, blocknr=%llu)", btree->b_inode->i_ino, (unsigned long long)ptr); brelse(bh); return -EIO; @@ -2104,7 +2104,7 @@ static int nilfs_btree_propagate(struct nilfs_bmap *btree, if (ret < 0) { if (unlikely(ret == -ENOENT)) { nilfs_crit(btree->b_inode->i_sb, - "writing node/leaf block does not appear in b-tree (ino=%lu) at key=%llu, level=%d", + "writing node/leaf block does not appear in b-tree (ino=%llu) at key=%llu, level=%d", btree->b_inode->i_ino, (unsigned long long)key, level); ret = -EINVAL; @@ -2146,7 +2146,7 @@ static void nilfs_btree_add_dirty_buffer(struct nilfs_bmap *btree, level >= NILFS_BTREE_LEVEL_MAX) { dump_stack(); nilfs_warn(btree->b_inode->i_sb, - "invalid btree level: %d (key=%llu, ino=%lu, blocknr=%llu)", + "invalid btree level: %d (key=%llu, ino=%llu, blocknr=%llu)", level, (unsigned long long)key, btree->b_inode->i_ino, (unsigned long long)bh->b_blocknr); diff --git a/fs/nilfs2/dir.c b/fs/nilfs2/dir.c index b243199036dfa1ab2299efaaa5bdf5da2d159ff2..3653db5cdb65137d1e660bb509c14ec4cbc8840b 100644 --- a/fs/nilfs2/dir.c +++ b/fs/nilfs2/dir.c @@ -150,7 +150,7 @@ static bool nilfs_check_folio(struct folio *folio, char *kaddr) Ebadsize: nilfs_error(sb, - "size of directory #%lu is not a multiple of chunk size", + "size of directory #%llu is not a multiple of chunk size", dir->i_ino); goto fail; Eshort: @@ -169,7 +169,7 @@ static bool nilfs_check_folio(struct folio *folio, char *kaddr) error = "disallowed inode number"; bad_entry: nilfs_error(sb, - "bad entry in directory #%lu: %s - offset=%lu, inode=%lu, rec_len=%zd, name_len=%d", + "bad entry in directory #%llu: %s - offset=%lu, inode=%lu, rec_len=%zd, name_len=%d", dir->i_ino, error, (folio->index << PAGE_SHIFT) + offs, (unsigned long)le64_to_cpu(p->inode), rec_len, p->name_len); @@ -177,7 +177,7 @@ static bool nilfs_check_folio(struct folio *folio, char *kaddr) Eend: p = (struct nilfs_dir_entry *)(kaddr + offs); nilfs_error(sb, - "entry in directory #%lu spans the page boundary offset=%lu, inode=%lu", + "entry in directory #%llu spans the page boundary offset=%lu, inode=%lu", dir->i_ino, (folio->index << PAGE_SHIFT) + offs, (unsigned long)le64_to_cpu(p->inode)); fail: @@ -251,7 +251,7 @@ static int nilfs_readdir(struct file *file, struct dir_context *ctx) kaddr = nilfs_get_folio(inode, n, &folio); if (IS_ERR(kaddr)) { - nilfs_error(sb, "bad page in #%lu", inode->i_ino); + nilfs_error(sb, "bad page in #%llu", inode->i_ino); ctx->pos += PAGE_SIZE - offset; return -EIO; } @@ -336,7 +336,7 @@ struct nilfs_dir_entry *nilfs_find_entry(struct inode *dir, /* next folio is past the blocks we've got */ if (unlikely(n > (dir->i_blocks >> (PAGE_SHIFT - 9)))) { nilfs_error(dir->i_sb, - "dir %lu size %lld exceeds block count %llu", + "dir %llu size %lld exceeds block count %llu", dir->i_ino, dir->i_size, (unsigned long long)dir->i_blocks); goto out; @@ -382,7 +382,7 @@ struct nilfs_dir_entry *nilfs_dotdot(struct inode *dir, struct folio **foliop) return next_de; fail: - nilfs_error(dir->i_sb, "directory #%lu %s", dir->i_ino, msg); + nilfs_error(dir->i_sb, "directory #%llu %s", dir->i_ino, msg); folio_release_kmap(folio, de); return NULL; } diff --git a/fs/nilfs2/direct.c b/fs/nilfs2/direct.c index 2d8dc6b35b5477947ca12a70288d3a3cce858aab..8bd0b1374e25f8ff510f3b36dbde2acc01aafc1e 100644 --- a/fs/nilfs2/direct.c +++ b/fs/nilfs2/direct.c @@ -338,7 +338,7 @@ static int nilfs_direct_assign(struct nilfs_bmap *bmap, key = nilfs_bmap_data_get_key(bmap, *bh); if (unlikely(key > NILFS_DIRECT_KEY_MAX)) { nilfs_crit(bmap->b_inode->i_sb, - "%s (ino=%lu): invalid key: %llu", + "%s (ino=%llu): invalid key: %llu", __func__, bmap->b_inode->i_ino, (unsigned long long)key); return -EINVAL; @@ -346,7 +346,7 @@ static int nilfs_direct_assign(struct nilfs_bmap *bmap, ptr = nilfs_direct_get_ptr(bmap, key); if (unlikely(ptr == NILFS_BMAP_INVALID_PTR)) { nilfs_crit(bmap->b_inode->i_sb, - "%s (ino=%lu): invalid pointer: %llu", + "%s (ino=%llu): invalid pointer: %llu", __func__, bmap->b_inode->i_ino, (unsigned long long)ptr); return -EINVAL; diff --git a/fs/nilfs2/gcinode.c b/fs/nilfs2/gcinode.c index 561c220799c7aee879ad866865e377799c8ee6bb..62d4c1b787e95c961a360a4214d621d564ad8b4c 100644 --- a/fs/nilfs2/gcinode.c +++ b/fs/nilfs2/gcinode.c @@ -137,7 +137,7 @@ int nilfs_gccache_wait_and_mark_dirty(struct buffer_head *bh) struct inode *inode = bh->b_folio->mapping->host; nilfs_err(inode->i_sb, - "I/O error reading %s block for GC (ino=%lu, vblocknr=%llu)", + "I/O error reading %s block for GC (ino=%llu, vblocknr=%llu)", buffer_nilfs_node(bh) ? "node" : "data", inode->i_ino, (unsigned long long)bh->b_blocknr); return -EIO; diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c index 51bde45d586509dda3ef0cb7c46facb7fb2c61dd..51f7e125a311b868860e3e111700d49d4cb98fa6 100644 --- a/fs/nilfs2/inode.c +++ b/fs/nilfs2/inode.c @@ -108,7 +108,7 @@ int nilfs_get_block(struct inode *inode, sector_t blkoff, * be locked in this case. */ nilfs_warn(inode->i_sb, - "%s (ino=%lu): a race condition while inserting a data block at offset=%llu", + "%s (ino=%llu): a race condition while inserting a data block at offset=%llu", __func__, inode->i_ino, (unsigned long long)blkoff); err = -EAGAIN; @@ -789,7 +789,7 @@ static void nilfs_truncate_bmap(struct nilfs_inode_info *ii, goto repeat; failed: - nilfs_warn(ii->vfs_inode.i_sb, "error %d truncating bmap (ino=%lu)", + nilfs_warn(ii->vfs_inode.i_sb, "error %d truncating bmap (ino=%llu)", ret, ii->vfs_inode.i_ino); } @@ -1026,7 +1026,7 @@ int nilfs_set_file_dirty(struct inode *inode, unsigned int nr_dirty) * this inode. */ nilfs_warn(inode->i_sb, - "cannot set file dirty (ino=%lu): the file is being freed", + "cannot set file dirty (ino=%llu): the file is being freed", inode->i_ino); spin_unlock(&nilfs->ns_inode_lock); return -EINVAL; /* @@ -1057,7 +1057,7 @@ int __nilfs_mark_inode_dirty(struct inode *inode, int flags) err = nilfs_load_inode_block(inode, &ibh); if (unlikely(err)) { nilfs_warn(inode->i_sb, - "cannot mark inode dirty (ino=%lu): error %d loading inode block", + "cannot mark inode dirty (ino=%llu): error %d loading inode block", inode->i_ino, err); return err; } diff --git a/fs/nilfs2/mdt.c b/fs/nilfs2/mdt.c index 946b0d3534a5f22f34ac44a91fb121541881c548..09adb40c65e505d92012a3d2f5fe8a5696e10056 100644 --- a/fs/nilfs2/mdt.c +++ b/fs/nilfs2/mdt.c @@ -203,7 +203,7 @@ static int nilfs_mdt_read_block(struct inode *inode, unsigned long block, err = -EIO; if (!buffer_uptodate(first_bh)) { nilfs_err(inode->i_sb, - "I/O error reading meta-data file (ino=%lu, block-offset=%lu)", + "I/O error reading meta-data file (ino=%llu, block-offset=%lu)", inode->i_ino, block); goto failed_bh; } diff --git a/fs/nilfs2/namei.c b/fs/nilfs2/namei.c index 40f4b1a28705b6e0eb8f0978cf3ac18b43aa1331..40ac679ec56e400b1df98e9be6fe9ca338a9ba51 100644 --- a/fs/nilfs2/namei.c +++ b/fs/nilfs2/namei.c @@ -292,7 +292,7 @@ static int nilfs_do_unlink(struct inode *dir, struct dentry *dentry) if (!inode->i_nlink) { nilfs_warn(inode->i_sb, - "deleting nonexistent file (ino=%lu), %d", + "deleting nonexistent file (ino=%llu), %d", inode->i_ino, inode->i_nlink); set_nlink(inode, 1); } diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c index 098a3bd103e04cd09b0689fe2017380d74664496..4b1bf559f3524b1cc3965dae9fd3e5745718569d 100644 --- a/fs/nilfs2/segment.c +++ b/fs/nilfs2/segment.c @@ -2024,7 +2024,7 @@ static int nilfs_segctor_collect_dirty_files(struct nilfs_sc_info *sci, ifile, ii->vfs_inode.i_ino, &ibh); if (unlikely(err)) { nilfs_warn(sci->sc_super, - "log writer: error %d getting inode block (ino=%lu)", + "log writer: error %d getting inode block (ino=%llu)", err, ii->vfs_inode.i_ino); return err; } diff --git a/include/trace/events/nilfs2.h b/include/trace/events/nilfs2.h index 8880c11733dd307c223cc62ee34ebeff650ecb12..86a0011c9eeaf031cfa0b79875b2b106ef8b7cfd 100644 --- a/include/trace/events/nilfs2.h +++ b/include/trace/events/nilfs2.h @@ -165,14 +165,14 @@ TRACE_EVENT(nilfs2_segment_usage_freed, TRACE_EVENT(nilfs2_mdt_insert_new_block, TP_PROTO(struct inode *inode, - unsigned long ino, + u64 ino, unsigned long block), TP_ARGS(inode, ino, block), TP_STRUCT__entry( __field(struct inode *, inode) - __field(unsigned long, ino) + __field(u64, ino) __field(unsigned long, block) ), @@ -182,7 +182,7 @@ TRACE_EVENT(nilfs2_mdt_insert_new_block, __entry->block = block; ), - TP_printk("inode = %p ino = %lu block = %lu", + TP_printk("inode = %p ino = %llu block = %lu", __entry->inode, __entry->ino, __entry->block) @@ -190,7 +190,7 @@ TRACE_EVENT(nilfs2_mdt_insert_new_block, TRACE_EVENT(nilfs2_mdt_submit_block, TP_PROTO(struct inode *inode, - unsigned long ino, + u64 ino, unsigned long blkoff, enum req_op mode), @@ -198,7 +198,7 @@ TRACE_EVENT(nilfs2_mdt_submit_block, TP_STRUCT__entry( __field(struct inode *, inode) - __field(unsigned long, ino) + __field(u64, ino) __field(unsigned long, blkoff) /* * Use field_struct() to avoid is_signed_type() on the @@ -214,7 +214,7 @@ TRACE_EVENT(nilfs2_mdt_submit_block, __entry->mode = mode; ), - TP_printk("inode = %p ino = %lu blkoff = %lu mode = %x", + TP_printk("inode = %p ino = %llu blkoff = %lu mode = %x", __entry->inode, __entry->ino, __entry->blkoff, -- 2.53.0