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 8981FEB3632 for ; Mon, 2 Mar 2026 20:40:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CA16F6B0105; Mon, 2 Mar 2026 15:40:09 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C41A36B0107; Mon, 2 Mar 2026 15:40:09 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AE3126B0108; Mon, 2 Mar 2026 15:40:09 -0500 (EST) 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 983406B0105 for ; Mon, 2 Mar 2026 15:40:09 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 755081C2CB for ; Mon, 2 Mar 2026 20:40:09 +0000 (UTC) X-FDA: 84502290138.17.3CAE44C Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by imf12.hostedemail.com (Postfix) with ESMTP id AE83B4000D for ; Mon, 2 Mar 2026 20:40:07 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ta7tLBiD; spf=pass (imf12.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=1772484007; 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=kV2bEqoEAjH0OaGHyMkXsZdTLvCacH8CXCKfy3WSG/E=; b=VWM3I4pJzhFeyjP7qeKbGOxktY10i5t4Z2Q0nUfkbWM8Fv6EMXEZgTy0mFzfGOR6bnTsca ZzUv16fZyuRuQdRtutG76EzN0cBPnG7nCdVVHHDKKI0Y/H5hSaPI/8GXnarNszPchItQBb nxS67PEkKBPLPzTEuj2u6vqS0wbOe6w= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ta7tLBiD; spf=pass (imf12.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=1772484007; a=rsa-sha256; cv=none; b=iuvLGZ294vO2Iv0mH7sUBhOlagWruoeInngWkrzKWtc5qPocyItM/2h3fSQcqYj6Zpgl0G 75UWHRnIIUvrOcvr8joh1WRkXcEVnX8HkTvn9mNOS2Sh+2nMe8H5a30ynv1KlPhx/0YPOu zvMxeMKFwuXTvYYckuoO3iCcu64nVgg= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 77B476111A; Mon, 2 Mar 2026 20:40:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 03AA5C19425; Mon, 2 Mar 2026 20:39:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772484006; bh=+8ClTK7vhtfFiVVbpIq6HAnhDkb9LptqIfRMoGhc6+M=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ta7tLBiDFAdvNXaECO6rLS5vMxz7KlFhIdJ5FwZBrLP7AgGOLy2BltUdf9bykPVRJ ZL82BblP87fHCNqitBKaKO54ayD56vnBTnBK6hVKHw7x/3PXz4AASy6xQD8FMUsEOC uZqygnvd3XwgzMnKCb56ThuRi/o6OWQyglAl97YcLq041kh47lpYEWoQfUGsEiY0XH xWYXpEk/KkoZoDxZmhRr/rcPkCKOzTD4futHaLJ27+wj/L/ReugsCb4NRvVn/nFdT5 +A6WwuUaN+/gJy9bqDIlWMPbwpLJwiwRxdaZHLKeno3E4LnI0XT8WorZ6MUhdHbWzi 7s4cXEEO9chlQ== From: Jeff Layton Date: Mon, 02 Mar 2026 15:24:47 -0500 Subject: [PATCH v2 063/110] f2fs: replace PRIino with %llu/%llx format strings MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260302-iino-u64-v2-63-e5388800dae0@kernel.org> References: <20260302-iino-u64-v2-0-e5388800dae0@kernel.org> In-Reply-To: <20260302-iino-u64-v2-0-e5388800dae0@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 , Eric Paris , Joerg Reuter , Marcel Holtmann , Johan Hedberg , Luiz Augusto von Dentz , Oliver Hartkopp , Marc Kleine-Budde , David Ahern , Neal Cardwell , Steffen Klassert , Herbert Xu , Remi Denis-Courmont , Marcelo Ricardo Leitner , Xin Long , Magnus Karlsson , Maciej Fijalkowski , Stanislav Fomichev , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend 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, audit@vger.kernel.org, linux-bluetooth@vger.kernel.org, linux-can@vger.kernel.org, linux-sctp@vger.kernel.org, bpf@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=28872; i=jlayton@kernel.org; h=from:subject:message-id; bh=+8ClTK7vhtfFiVVbpIq6HAnhDkb9LptqIfRMoGhc6+M=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBppfIA/Gmen3gv4J5n/HCi7T33pLlhzjzrS+yut YM531zK/NyJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaaXyAAAKCRAADmhBGVaC FURUD/9Pi+bvmR5o/N3ZJJu5gmf8LXsZsfdPOWxFJ4nV+mq+HHo2yDMYD1Rdfp7py7U8zg7l6Ak YBxOITP7I2+Nyvt8wDXDgkiAuK+JQEJF1K0CQeyNYqeF61t+rmPzwQDL6GWjg5r9a+113G508+M Ph/igHWc8htKz6v0CkC0ktalFIVBvRAJBwc9sGx6CtUjyHkgmRiyONbG2NyEKinChpy8iyCnbFH 5Kuhhcy+P0hfiW+ku2r50BDlHffG8g/suxgWPU5aStAw2or+IuXDKlG9Mdane2dOsLr+5O6KoTJ bKOF36p/mvgcSuQrjL6YcNfig5kRS7rtFUExjUv1k8U0TjwRl120JYS+b/l8XtzNPokwN2RTzhF gNWRW2lvYxrvLkMFgBT7yDkPZWjms2tXcQDodlOpl4NsZkmoEuuFBiDJQkVXn84BBCu+mDcI0p/ 3PAqPaqEhqWBmB9a/dwkqcg4/DZVGfG7Cpu9mV32q0gTjYI6HAiKmP1532Ra6CWOfCeFTknlhqQ 5oD8u9wWwtDiQwaHKJu4yHwuM8/iQpTCnoHSXQDo7bXgpr6ML4fZs0MBrHeafcIjvQpA+KjH3p7 nW/l7EE78u9vsd2jTPQk0i3NAVGRdGLV3wIb7am/cNaa0Me4+rAzFvWPfRIuUV11EVxqqkgJgr7 MN0xWzCpz+6OEfw== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 X-Rspamd-Queue-Id: AE83B4000D X-Stat-Signature: z7exh9pj3hzturn7qaru1ewa9gr5dn5k X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1772484007-234014 X-HE-Meta: U2FsdGVkX18Ut7KuHJhiyXLssEbENeyigLoWYy4GnHTMErefBP/sY0ux4pzlAK9ZD5sJb4d6BdzUrs3xtYqfMV9msV3LaF/V/fElYSCqKCqXvrU0Jie+1IARYDFhWOuC30cMaBLHudopSpS3YvrquZXzl/rNqv8yysBj84YtX3Z0fPgRjaY07NlKTmo2ne2HGCtNUt/1/aKIqtsMfdo7f50tUdu4yI4g6KzEDC2GZtIMPmnRwQSOCqIkZ6ZYcNV04+N9AWVpRDxjUpAbSGJjfY6ARUI6alU9Y+ltYv4nXQokYy8PxZ1Rz8qRg6cQF8JQwtx8NBveHDP9CdEKLD50x0504NoAz4/XQmzbvS6eLX/dipulm8oVLRd91oNV9fXP1Xs7IcCgwb6cd30KaqG6qU+ZqHJSDYKTXgtihMOudzPK7avSlXQ7iZwHP68gU130SdthskJEVbk2pN68G8AvEmeqAuxYsthJJUCwDQyqAyDRpHlHxIhsq7kE93avRotV458f7e01LC1KuJnkDoHenbZL+qpplwfOXp+I73luAos4OmcdFB8FfEU8ADgDmE79zwMLFnV8vZtb2W7S8ySlRfQ0pdjFtIPdNiJw+gLWC0mubeN1Fvz9KhHWI7myuFQRSGSjJi2J6hKPVvnxrxfZAr1qN9utoABC4AqUGF1ODUVYb4ObEK6AwROC+CxVrBl37ztomyjL6UdNTZCXju6CJ5wwg4ZUGKbZCRfKFE+PnbHBtoran/BxJDAE3n5oQ9ddYHaf+yRaAg7e6RugqnJU9PUoUXdjLq/+LKWty78l+FlX6q7wCE5OcSwV0C9Y3RojeQpaKFY5f6+WB52XrTZ80LIjEMudPVerZbG2PBwDuQANU2txFvfiWK2xmjcm9mIG/63lFE3f2tpgPVdw5y2/yNYSXtYdYoWAbhqOOdr5M8LaSHKlbPYQDXL0nlHc9RowR5PXGR0+1WDffDkaWdD +W/eoo8L rCTaSxE5yJMa7Y99oygCTDAORHzVHfHxPEU35kj4SlG04ioMe/UESkwAawBaOEsoUJMba9w57UPhz/0sGwegQYZmn+2RnLLv3h6UyeCT/QlX3K1ene0S5ZYRYz3Wr4ZU6+tiy60PqMUBhwns8tJITmkqGPSJcdjJ1PNOVjt/9dWr0DJOUpO/IEGyRo74LVwMaAHIEg0loZRW5lA2MBqRSYWVblxowrG3/SsGlF2IvGXkGeGn7evqUq2sXCJ3pfScoun552JNzy7FzE2iXEJm0HH7ExkQ1dHP/dXDrVoLJ1GyO7DTwp7Km8sfp7/BMGINJyODaxCE/F/kqU22WG4N9iLNsTWOWeRuBP4bucgTlda1knpVLqbfrhcoXQLmdR3BpFjQW3C5HWtIv/eWcjI8K3UHBpSkt8O7HG8cM5DvQKfW2gy/BI6Z4qpGu/ecAVnTPHBqOxm2CP5iqup602VcvwwEk85i4DIF6hhIvvI+usH0abbn1/cr1oJAsTMJNeph5UM6XArFQgpePQkSBaHbRM77s//ArioFpnDo0AFLOVw/oDGE1OOsQEp8Ky3ivZ+eB6zkfpE8UVi2C79bGxCCTTsQvpSoeNl2OZaYYceeU2yyQwZqKdmujRDCzdtd7vBS4UrF/KFjp3ZjKWzoVY5lmnsBvpLQklZqRsqzKn80FYcRfDIxRZX9NJGlqS+LxWtJyWQwcj+1J3dscG5aDBIrPUeE40mKW4Mme98Q/M0f22+XPUvHpxYCcoMPVx6wSuDvkEEzY87IZR6ll8e87oGfurMJPKRg3+sebxRsD620X/jZ+WXBLMfpd1b/tDZzZMQ3e1A6/UV6NU1p0MgNm23ZQgiKNI16iiYtQsXQXf6uNMcSi9x9yQZ28RZSULnRcnnPPwtuybPU6u3/QDVKXsyuaUPxULmdsc2ZM3CHSX3xxPIKEFlpqCdEYJM5M6p6Z0nqTn/pO2cK7B4USrvgrwd+j7BfXr2rG iIMEC56x SWRc/cGUJJtul9Uy0Hnv46+CJghFMkVq7K3h931qcqxMkljebv9YZMW7jFvCnvlaNt6R3alLzgN8X+UA72kLUxWvoaRlpdBqgDbSqR0uFg+EvI2raMuYA84pSsETrlIz11fbfqtJm9GTC26/JWlu4o81ovhsnCVCdH9/q5zHqPFpDx+KXg+00bIDcqVEIx4Ot60YmX4R1ta6IDwGykwNiyqqYIlCVGJpSgE5qIxkSsOTen+/pwZIxRlZsN+PiZ7kFjEeTlAdQVABwKBtK9du1ppmiDVcVRUD1jC6pay4NUH5B2fQ8FWjBIlcSyCdZPmY7Uwl1YDpC1BefRJN/+ZXqu0vYa0OcpQdqbZf/GyqPfPSuT5oID44HKDno8bdyBSS9n7Ygn11E7Nxo/dROO33AMqW0ta87WCsyXWkkX5ki6eDXpTh+lXtxK27NHm/SK91EUAEaZL3sJIaz5mvFrQPXegwM2Zrbg67vddzkpZoP+xGQA4DWQOvtJcNIVl0/C5LreDcw3+vULY0FKlY9eB+e6V8f8RAT52KQjCEBxWxw64KEkVHurWuWppwdCfmC4kBMFx8IwFkossFyPQBEtsdlulWOzuVjXegWF8/1meTmw6Xj1mIIfs45ciwR5V2EQ2k1GbNbW54a5Y83r1x4ePYlE3HGPA/xOf6dw7839qlxDeCpz9qYR9W+gw2js2pqZMdsolqtTiY92yGncbyg1kE39FDbHJe1i6MlQKgJrtAi+898II6txb+hR4X+DJXivI79L+tSdoon6HPAWcVPyl98AeXMjfenbzbSYeZlLVdDPGJarlDefXJIR4RwSsLl+CaTR9lVfSJ2Z1vUiLQVF3cnFzMgQTIS2WGWibS2+d9RxIJlTKqYS/B3NAZ+1ilW236qnYrZLBrA6z7W8aQiklynykBnzm9cuoubCL4TQhmNGatRyGLynuHLV5Qzxy0i5eY+D/xxwAWiVKYmDVvCzxOkT3LcCEyB C0Z9vpUD wuicF0R9FqoY1C/i7FVL9wvRr92vzn91eU20PNUNdpYn612FofI88KoomtAnjpYgYmnHks5Be8FlxoM+UhKBgMx4ebYyQx1ws5UeIhEIq0BB5hG66r/2CJfxgDhu7VH7y80wRj/J/ApAN94tzoE6I29XPCxKKFE4YZvknNtYlnsJUTxz8rUlyyzhYMHin0uDtvcF18b0qbuY6AeB2ZZRX0khIuUmgtjHsRNjVpxu6jsaJQrSGAjdhDCugU92Qhw5H7yLwg35v7cHSmZum7N3nzLzDyT//ZaCrOWwi/j7N7LndG8Q3idBYLLRiQGmZvq+3iehu5sHZOeqLDRrdz1/TXFxL57esSJAk+8eWP7DvVusC5akUxsruIwUM9Ht6Ztiy/uGY1GqHd+QiLNRnzVF0JHPsU6a9p197VuE7YKmLKjWz3B/3kB410l7GiPC+wF9SgyUlkRXMjvREuqjjhRon4oNqhcVWq826HhGwlfcPeUBaXMgPwszRFzi1J9zjDo4vxDTm8n7E6hDcT+DDHvEwEEjRNHLrkvEeIsjYDE0uYphCeE1TBNZGUnjvWj8zWnTZE3sd/NURGXiS0h1D3KA372f2lTb9fEdNifykqbK2KPoHJKjxHLqK14wNP1zuNh9wBgFqf2Ntzruh4wsbly5JH9fQpr8rgcZNyrkeIhf9Fozsq6iS2+3H4gQj0relr0RfZM2Wen2AF8PPx0pai9sh9RNoIHSpx2jFn+H1mJzKHKzNihE8HsDmgksygIRpMvopiYycZxfM8IMAhbl6iXD8h80h/gPsRJg5cxERlqRvZVXd7Kti5u0t72mF+9Q79VHRTN/hzfR1DcBo0QSbcIzV2dUJX9uBw8XdRyMPM0E8A/d1nsJJbG2JLDd6wftltvi8bEWX7MO1GWRz4OqQW/es+PQywkk+mWkLudXG8mN0NKHsinUNhjQp8/cgrvbkkrgf1jQCJNTcH/Sjx09RLWqoIDxCfCO4 fJ46G4lv ta8U4hNJxFg8OySUhYyJ21w3jB2xxqZ1BNiciZgwUFY3jb/oo3jsUC/EazAGOEzAi7jvFsAxiVyIWtsO8N8RVpQ+jUJZB8UQOKGtx8AsO+fkhZV+HTZRysG6IHwThsb1oy9G6qn8A31YGFEVHkJBJrW0etu/xp5BaRT2IqNQmXeBXSvO8Mt+13PcTJiZQzuslfwSTerobRINVTzYBt13LfsH7kJxylVGKqPObOQiqdAzah4bqGvM8q1mZOB5+GgKgNvS8HQjFHB2BmTNFlV7SuStYxqDyYS5Ki4FyTZbWidgi2a0EtkJIEj16iuCVwzUanRgEOdURkbj6zb68y/1KeqFjYWYC825a3J+jaHiHCIDnHgY+Dcu8wQs/P5PmXR6g= Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Now that i_ino is u64 and the PRIino format macro has been removed, replace all uses in f2fs with the concrete format strings. Signed-off-by: Jeff Layton --- fs/f2fs/compress.c | 4 ++-- fs/f2fs/dir.c | 2 +- fs/f2fs/extent_cache.c | 8 ++++---- fs/f2fs/f2fs.h | 6 +++--- fs/f2fs/file.c | 12 ++++++------ fs/f2fs/gc.c | 2 +- fs/f2fs/inline.c | 4 ++-- fs/f2fs/inode.c | 48 ++++++++++++++++++++++++------------------------ fs/f2fs/namei.c | 8 ++++---- fs/f2fs/node.c | 12 ++++++------ fs/f2fs/recovery.c | 10 +++++----- fs/f2fs/xattr.c | 10 +++++----- 12 files changed, 63 insertions(+), 63 deletions(-) diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c index 04ca483017a4db4ffe5ba21674af969ccb3d4ef3..0b8be500db656f8439725cac2f6a927c2f06ca4f 100644 --- a/fs/f2fs/compress.c +++ b/fs/f2fs/compress.c @@ -773,7 +773,7 @@ void f2fs_decompress_cluster(struct decompress_io_ctx *dic, bool in_task) if (!is_inode_flag_set(dic->inode, FI_COMPRESS_CORRUPT)) { set_inode_flag(dic->inode, FI_COMPRESS_CORRUPT); f2fs_info_ratelimited(sbi, - "checksum invalid, nid = %" PRIino "u, %x vs %x", + "checksum invalid, nid = %llu, %x vs %x", dic->inode->i_ino, provided, calculated); } @@ -932,7 +932,7 @@ bool f2fs_sanity_check_cluster(struct dnode_of_data *dn) return false; out: - f2fs_warn(sbi, "access invalid cluster, ino:%" PRIino "u, nid:%u, ofs_in_node:%u, reason:%s", + f2fs_warn(sbi, "access invalid cluster, ino:%llu, nid:%u, ofs_in_node:%u, reason:%s", dn->inode->i_ino, dn->nid, dn->ofs_in_node, reason); set_sbi_flag(sbi, SBI_NEED_FSCK); return true; diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index d8ddf530663c9f30af0243bfabab2c169951ddc8..38802ee2e40deb4995a4e5f4118330b90b2f10e2 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -368,7 +368,7 @@ struct f2fs_dir_entry *__f2fs_find_entry(struct inode *dir, max_depth = F2FS_I(dir)->i_current_depth; if (unlikely(max_depth > MAX_DIR_HASH_DEPTH)) { - f2fs_warn(F2FS_I_SB(dir), "Corrupted max_depth of %" PRIino "u: %u", + f2fs_warn(F2FS_I_SB(dir), "Corrupted max_depth of %llu: %u", dir->i_ino, max_depth); max_depth = MAX_DIR_HASH_DEPTH; f2fs_i_depth_write(dir, max_depth); diff --git a/fs/f2fs/extent_cache.c b/fs/f2fs/extent_cache.c index 45c098b1f89f47aecd6354ecf2d4803abb275480..d73aeef333a24766aaab9914a02b99fbf035e78d 100644 --- a/fs/f2fs/extent_cache.c +++ b/fs/f2fs/extent_cache.c @@ -34,7 +34,7 @@ bool sanity_check_extent_cache(struct inode *inode, struct folio *ifolio) if (!f2fs_is_valid_blkaddr(sbi, ei.blk, DATA_GENERIC_ENHANCE) || !f2fs_is_valid_blkaddr(sbi, ei.blk + ei.len - 1, DATA_GENERIC_ENHANCE)) { - f2fs_warn(sbi, "%s: inode (ino=%" PRIino "x) extent info [%u, %u, %u] is incorrect, run fsck to fix", + f2fs_warn(sbi, "%s: inode (ino=%llx) extent info [%u, %u, %u] is incorrect, run fsck to fix", __func__, inode->i_ino, ei.blk, ei.fofs, ei.len); return false; @@ -50,14 +50,14 @@ bool sanity_check_extent_cache(struct inode *inode, struct folio *ifolio) if (devi == 0) { f2fs_warn(sbi, - "%s: inode (ino=%" PRIino "x) is an alias of meta device", + "%s: inode (ino=%llx) is an alias of meta device", __func__, inode->i_ino); return false; } if (bdev_is_zoned(FDEV(devi).bdev)) { f2fs_warn(sbi, - "%s: device alias inode (ino=%" PRIino "x)'s extent info " + "%s: device alias inode (ino=%llx)'s extent info " "[%u, %u, %u] maps to zoned block device", __func__, inode->i_ino, ei.blk, ei.fofs, ei.len); return false; @@ -65,7 +65,7 @@ bool sanity_check_extent_cache(struct inode *inode, struct folio *ifolio) return true; } - f2fs_warn(sbi, "%s: device alias inode (ino=%" PRIino "x)'s extent info " + f2fs_warn(sbi, "%s: device alias inode (ino=%llx)'s extent info " "[%u, %u, %u] is inconsistent w/ any devices", __func__, inode->i_ino, ei.blk, ei.fofs, ei.len); return false; diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index c5d175b6eab52bd366bbef870d54d13f35c8fe00..760e6d80bbddd8393394c30c740ba05faded332f 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -2706,7 +2706,7 @@ static inline void dec_valid_block_count(struct f2fs_sb_info *sbi, spin_lock(&sbi->stat_lock); if (unlikely(sbi->total_valid_block_count < count)) { - f2fs_warn(sbi, "Inconsistent total_valid_block_count:%u, ino:%" PRIino "u, count:%u", + f2fs_warn(sbi, "Inconsistent total_valid_block_count:%u, ino:%llu, count:%u", sbi->total_valid_block_count, inode->i_ino, count); sbi->total_valid_block_count = 0; set_sbi_flag(sbi, SBI_NEED_FSCK); @@ -2719,7 +2719,7 @@ static inline void dec_valid_block_count(struct f2fs_sb_info *sbi, sbi->current_reserved_blocks + count); spin_unlock(&sbi->stat_lock); if (unlikely(inode->i_blocks < sectors)) { - f2fs_warn(sbi, "Inconsistent i_blocks, ino:%" PRIino "u, iblocks:%llu, sectors:%llu", + f2fs_warn(sbi, "Inconsistent i_blocks, ino:%llu, iblocks:%llu, sectors:%llu", inode->i_ino, (unsigned long long)inode->i_blocks, (unsigned long long)sectors); @@ -2993,7 +2993,7 @@ static inline void dec_valid_node_count(struct f2fs_sb_info *sbi, dquot_free_inode(inode); } else { if (unlikely(inode->i_blocks == 0)) { - f2fs_warn(sbi, "dec_valid_node_count: inconsistent i_blocks, ino:%" PRIino "u, iblocks:%llu", + f2fs_warn(sbi, "dec_valid_node_count: inconsistent i_blocks, ino:%llu, iblocks:%llu", inode->i_ino, (unsigned long long)inode->i_blocks); set_sbi_flag(sbi, SBI_NEED_FSCK); diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 2029fc802669700c7b29cdb04ca022dec6632fd2..a56bbcca7898282eab1fea7e1b2acee5ea00df88 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -1917,7 +1917,7 @@ static int f2fs_expand_inode_data(struct inode *inode, loff_t offset, f2fs_up_write(&sbi->pin_sem); err = -ENOSPC; f2fs_warn_ratelimited(sbi, - "ino:%" PRIino "u, start:%lu, end:%lu, need to trigger GC to" + "ino:%llu, start:%lu, end:%lu, need to trigger GC to" "reclaim enough free segment when checkpoint is enabled", inode->i_ino, pg_start, pg_end); goto out_err; @@ -2307,7 +2307,7 @@ static int f2fs_ioc_start_atomic_write(struct file *filp, bool truncate) * f2fs_is_atomic_file. */ if (get_dirty_pages(inode)) - f2fs_warn(sbi, "Unexpected flush for atomic writes: ino=%" PRIino "u, npages=%u", + f2fs_warn(sbi, "Unexpected flush for atomic writes: ino=%llu, npages=%u", inode->i_ino, get_dirty_pages(inode)); ret = filemap_write_and_wait_range(inode->i_mapping, 0, LLONG_MAX); if (ret) @@ -3494,7 +3494,7 @@ int f2fs_pin_file_control(struct inode *inode, bool inc) return -EINVAL; if (fi->i_gc_failures >= sbi->gc_pin_file_threshold) { - f2fs_warn(sbi, "%s: Enable GC = ino %" PRIino "x after %x GC trials", + f2fs_warn(sbi, "%s: Enable GC = ino %llx after %x GC trials", __func__, inode->i_ino, fi->i_gc_failures); clear_inode_flag(inode, FI_PIN_FILE); return -EAGAIN; @@ -3679,7 +3679,7 @@ static int f2fs_ioc_enable_verity(struct file *filp, unsigned long arg) if (!f2fs_sb_has_verity(F2FS_I_SB(inode))) { f2fs_warn(F2FS_I_SB(inode), - "Can't enable fs-verity on inode %" PRIino "u: the verity feature is not enabled on this filesystem", + "Can't enable fs-verity on inode %llu: the verity feature is not enabled on this filesystem", inode->i_ino); return -EOPNOTSUPP; } @@ -3950,7 +3950,7 @@ static int f2fs_release_compress_blocks(struct file *filp, unsigned long arg) } else if (released_blocks && atomic_read(&fi->i_compr_blocks)) { set_sbi_flag(sbi, SBI_NEED_FSCK); - f2fs_warn(sbi, "%s: partial blocks were released i_ino=%" PRIino "x " + f2fs_warn(sbi, "%s: partial blocks were released i_ino=%llx " "iblocks=%llu, released=%u, compr_blocks=%u, " "run fsck to fix.", __func__, inode->i_ino, inode->i_blocks, @@ -4133,7 +4133,7 @@ static int f2fs_reserve_compress_blocks(struct file *filp, unsigned long arg) } else if (reserved_blocks && atomic_read(&fi->i_compr_blocks)) { set_sbi_flag(sbi, SBI_NEED_FSCK); - f2fs_warn(sbi, "%s: partial blocks were reserved i_ino=%" PRIino "x " + f2fs_warn(sbi, "%s: partial blocks were reserved i_ino=%llx " "iblocks=%llu, reserved=%u, compr_blocks=%u, " "run fsck to fix.", __func__, inode->i_ino, inode->i_blocks, diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c index c7efb7807e9c276d60b65768fb0c98f405345af0..c0c8a1056d6b089397b4aa92b88b14cfd88c9de5 100644 --- a/fs/f2fs/gc.c +++ b/fs/f2fs/gc.c @@ -1622,7 +1622,7 @@ static int gc_data_segment(struct f2fs_sb_info *sbi, struct f2fs_summary *sum, iput(inode); set_sbi_flag(sbi, SBI_NEED_FSCK); f2fs_err_ratelimited(sbi, - "inode %" PRIino "u has both inline_data flag and " + "inode %llu has both inline_data flag and " "data block, nid=%u, ofs_in_node=%u", inode->i_ino, dni.nid, ofs_in_node); continue; diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c index 33f434a7031b725816b7a71359daeffa4c8c6af9..2669439b941387a96318f77fca7dfe35723e59d9 100644 --- a/fs/f2fs/inline.c +++ b/fs/f2fs/inline.c @@ -176,7 +176,7 @@ int f2fs_convert_inline_folio(struct dnode_of_data *dn, struct folio *folio) if (unlikely(dn->data_blkaddr != NEW_ADDR)) { f2fs_put_dnode(dn); set_sbi_flag(fio.sbi, SBI_NEED_FSCK); - f2fs_warn(fio.sbi, "%s: corrupted inline inode ino=%" PRIino "u, i_addr[0]:0x%x, run fsck to fix.", + f2fs_warn(fio.sbi, "%s: corrupted inline inode ino=%llu, i_addr[0]:0x%x, run fsck to fix.", __func__, dn->inode->i_ino, dn->data_blkaddr); f2fs_handle_error(fio.sbi, ERROR_INVALID_BLKADDR); return -EFSCORRUPTED; @@ -431,7 +431,7 @@ static int f2fs_move_inline_dirents(struct inode *dir, struct folio *ifolio, if (unlikely(dn.data_blkaddr != NEW_ADDR)) { f2fs_put_dnode(&dn); set_sbi_flag(F2FS_F_SB(folio), SBI_NEED_FSCK); - f2fs_warn(F2FS_F_SB(folio), "%s: corrupted inline inode ino=%" PRIino "u, i_addr[0]:0x%x, run fsck to fix.", + f2fs_warn(F2FS_F_SB(folio), "%s: corrupted inline inode ino=%llu, i_addr[0]:0x%x, run fsck to fix.", __func__, dir->i_ino, dn.data_blkaddr); f2fs_handle_error(F2FS_F_SB(folio), ERROR_INVALID_BLKADDR); err = -EFSCORRUPTED; diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c index e3fb676b417bcc63e23137949e26f68ccce09cb4..f27198d6695b91d2a041318aeecd04c65d38a4ba 100644 --- a/fs/f2fs/inode.c +++ b/fs/f2fs/inode.c @@ -203,14 +203,14 @@ static bool sanity_check_compress_inode(struct inode *inode, if (ri->i_compress_algorithm >= COMPRESS_MAX) { f2fs_warn(sbi, - "%s: inode (ino=%" PRIino "x) has unsupported compress algorithm: %u, run fsck to fix", + "%s: inode (ino=%llx) has unsupported compress algorithm: %u, run fsck to fix", __func__, inode->i_ino, ri->i_compress_algorithm); return false; } if (le64_to_cpu(ri->i_compr_blocks) > SECTOR_TO_BLOCK(inode->i_blocks)) { f2fs_warn(sbi, - "%s: inode (ino=%" PRIino "x) has inconsistent i_compr_blocks:%llu, i_blocks:%llu, run fsck to fix", + "%s: inode (ino=%llx) has inconsistent i_compr_blocks:%llu, i_blocks:%llu, run fsck to fix", __func__, inode->i_ino, le64_to_cpu(ri->i_compr_blocks), SECTOR_TO_BLOCK(inode->i_blocks)); return false; @@ -218,7 +218,7 @@ static bool sanity_check_compress_inode(struct inode *inode, if (ri->i_log_cluster_size < MIN_COMPRESS_LOG_SIZE || ri->i_log_cluster_size > MAX_COMPRESS_LOG_SIZE) { f2fs_warn(sbi, - "%s: inode (ino=%" PRIino "x) has unsupported log cluster size: %u, run fsck to fix", + "%s: inode (ino=%llx) has unsupported log cluster size: %u, run fsck to fix", __func__, inode->i_ino, ri->i_log_cluster_size); return false; } @@ -262,7 +262,7 @@ static bool sanity_check_compress_inode(struct inode *inode, return true; err_level: - f2fs_warn(sbi, "%s: inode (ino=%" PRIino "x) has unsupported compress level: %u, run fsck to fix", + f2fs_warn(sbi, "%s: inode (ino=%llx) has unsupported compress level: %u, run fsck to fix", __func__, inode->i_ino, clevel); return false; } @@ -276,40 +276,40 @@ static bool sanity_check_inode(struct inode *inode, struct folio *node_folio) iblocks = le64_to_cpu(F2FS_INODE(node_folio)->i_blocks); if (!iblocks) { - f2fs_warn(sbi, "%s: corrupted inode i_blocks i_ino=%" PRIino "x iblocks=%llu, run fsck to fix.", + f2fs_warn(sbi, "%s: corrupted inode i_blocks i_ino=%llx iblocks=%llu, run fsck to fix.", __func__, inode->i_ino, iblocks); return false; } if (ino_of_node(node_folio) != nid_of_node(node_folio)) { - f2fs_warn(sbi, "%s: corrupted inode footer i_ino=%" PRIino "x, ino,nid: [%u, %u] run fsck to fix.", + f2fs_warn(sbi, "%s: corrupted inode footer i_ino=%llx, ino,nid: [%u, %u] run fsck to fix.", __func__, inode->i_ino, ino_of_node(node_folio), nid_of_node(node_folio)); return false; } if (ino_of_node(node_folio) == fi->i_xattr_nid) { - f2fs_warn(sbi, "%s: corrupted inode i_ino=%" PRIino "x, xnid=%x, run fsck to fix.", + f2fs_warn(sbi, "%s: corrupted inode i_ino=%llx, xnid=%x, run fsck to fix.", __func__, inode->i_ino, fi->i_xattr_nid); return false; } if (S_ISDIR(inode->i_mode) && unlikely(inode->i_nlink == 1)) { - f2fs_warn(sbi, "%s: directory inode (ino=%" PRIino "x) has a single i_nlink", + f2fs_warn(sbi, "%s: directory inode (ino=%llx) has a single i_nlink", __func__, inode->i_ino); return false; } if (f2fs_has_extra_attr(inode)) { if (!f2fs_sb_has_extra_attr(sbi)) { - f2fs_warn(sbi, "%s: inode (ino=%" PRIino "x) is with extra_attr, but extra_attr feature is off", + f2fs_warn(sbi, "%s: inode (ino=%llx) is with extra_attr, but extra_attr feature is off", __func__, inode->i_ino); return false; } if (fi->i_extra_isize > F2FS_TOTAL_EXTRA_ATTR_SIZE || fi->i_extra_isize < F2FS_MIN_EXTRA_ATTR_SIZE || fi->i_extra_isize % sizeof(__le32)) { - f2fs_warn(sbi, "%s: inode (ino=%" PRIino "x) has corrupted i_extra_isize: %d, max: %zu", + f2fs_warn(sbi, "%s: inode (ino=%llx) has corrupted i_extra_isize: %d, max: %zu", __func__, inode->i_ino, fi->i_extra_isize, F2FS_TOTAL_EXTRA_ATTR_SIZE); return false; @@ -327,7 +327,7 @@ static bool sanity_check_inode(struct inode *inode, struct folio *node_folio) f2fs_has_inline_xattr(inode) && (fi->i_inline_xattr_size < MIN_INLINE_XATTR_SIZE || fi->i_inline_xattr_size > MAX_INLINE_XATTR_SIZE)) { - f2fs_warn(sbi, "%s: inode (ino=%" PRIino "x) has corrupted i_inline_xattr_size: %d, min: %zu, max: %lu", + f2fs_warn(sbi, "%s: inode (ino=%llx) has corrupted i_inline_xattr_size: %d, min: %zu, max: %lu", __func__, inode->i_ino, fi->i_inline_xattr_size, MIN_INLINE_XATTR_SIZE, MAX_INLINE_XATTR_SIZE); return false; @@ -335,64 +335,64 @@ static bool sanity_check_inode(struct inode *inode, struct folio *node_folio) if (!f2fs_sb_has_extra_attr(sbi)) { if (f2fs_sb_has_project_quota(sbi)) { - f2fs_warn(sbi, "%s: corrupted inode ino=%" PRIino "x, wrong feature flag: %u, run fsck to fix.", + f2fs_warn(sbi, "%s: corrupted inode ino=%llx, wrong feature flag: %u, run fsck to fix.", __func__, inode->i_ino, F2FS_FEATURE_PRJQUOTA); return false; } if (f2fs_sb_has_inode_chksum(sbi)) { - f2fs_warn(sbi, "%s: corrupted inode ino=%" PRIino "x, wrong feature flag: %u, run fsck to fix.", + f2fs_warn(sbi, "%s: corrupted inode ino=%llx, wrong feature flag: %u, run fsck to fix.", __func__, inode->i_ino, F2FS_FEATURE_INODE_CHKSUM); return false; } if (f2fs_sb_has_flexible_inline_xattr(sbi)) { - f2fs_warn(sbi, "%s: corrupted inode ino=%" PRIino "x, wrong feature flag: %u, run fsck to fix.", + f2fs_warn(sbi, "%s: corrupted inode ino=%llx, wrong feature flag: %u, run fsck to fix.", __func__, inode->i_ino, F2FS_FEATURE_FLEXIBLE_INLINE_XATTR); return false; } if (f2fs_sb_has_inode_crtime(sbi)) { - f2fs_warn(sbi, "%s: corrupted inode ino=%" PRIino "x, wrong feature flag: %u, run fsck to fix.", + f2fs_warn(sbi, "%s: corrupted inode ino=%llx, wrong feature flag: %u, run fsck to fix.", __func__, inode->i_ino, F2FS_FEATURE_INODE_CRTIME); return false; } if (f2fs_sb_has_compression(sbi)) { - f2fs_warn(sbi, "%s: corrupted inode ino=%" PRIino "x, wrong feature flag: %u, run fsck to fix.", + f2fs_warn(sbi, "%s: corrupted inode ino=%llx, wrong feature flag: %u, run fsck to fix.", __func__, inode->i_ino, F2FS_FEATURE_COMPRESSION); return false; } } if (f2fs_sanity_check_inline_data(inode, node_folio)) { - f2fs_warn(sbi, "%s: inode (ino=%" PRIino "x, mode=%u) should not have inline_data, run fsck to fix", + f2fs_warn(sbi, "%s: inode (ino=%llx, mode=%u) should not have inline_data, run fsck to fix", __func__, inode->i_ino, inode->i_mode); return false; } if (f2fs_has_inline_dentry(inode) && !S_ISDIR(inode->i_mode)) { - f2fs_warn(sbi, "%s: inode (ino=%" PRIino "x, mode=%u) should not have inline_dentry, run fsck to fix", + f2fs_warn(sbi, "%s: inode (ino=%llx, mode=%u) should not have inline_dentry, run fsck to fix", __func__, inode->i_ino, inode->i_mode); return false; } if ((fi->i_flags & F2FS_CASEFOLD_FL) && !f2fs_sb_has_casefold(sbi)) { - f2fs_warn(sbi, "%s: inode (ino=%" PRIino "x) has casefold flag, but casefold feature is off", + f2fs_warn(sbi, "%s: inode (ino=%llx) has casefold flag, but casefold feature is off", __func__, inode->i_ino); return false; } if (fi->i_xattr_nid && f2fs_check_nid_range(sbi, fi->i_xattr_nid)) { - f2fs_warn(sbi, "%s: inode (ino=%" PRIino "x) has corrupted i_xattr_nid: %u, run fsck to fix.", + f2fs_warn(sbi, "%s: inode (ino=%llx) has corrupted i_xattr_nid: %u, run fsck to fix.", __func__, inode->i_ino, fi->i_xattr_nid); return false; } if (IS_DEVICE_ALIASING(inode)) { if (!f2fs_sb_has_device_alias(sbi)) { - f2fs_warn(sbi, "%s: inode (ino=%" PRIino "x) has device alias flag, but the feature is off", + f2fs_warn(sbi, "%s: inode (ino=%llx) has device alias flag, but the feature is off", __func__, inode->i_ino); return false; } if (!f2fs_is_pinned_file(inode)) { - f2fs_warn(sbi, "%s: inode (ino=%" PRIino "x) has device alias flag, but is not pinned", + f2fs_warn(sbi, "%s: inode (ino=%llx) has device alias flag, but is not pinned", __func__, inode->i_ino); return false; } @@ -925,7 +925,7 @@ void f2fs_evict_inode(struct inode *inode) */ if (is_inode_flag_set(inode, FI_DIRTY_INODE)) { f2fs_warn(F2FS_I_SB(inode), - "f2fs_evict_inode: inconsistent node id, ino:%" PRIino "u", + "f2fs_evict_inode: inconsistent node id, ino:%llu", inode->i_ino); f2fs_inode_synced(inode); set_sbi_flag(sbi, SBI_NEED_FSCK); @@ -954,7 +954,7 @@ void f2fs_evict_inode(struct inode *inode) */ if (is_inode_flag_set(inode, FI_DIRTY_INODE)) { f2fs_warn(sbi, - "f2fs_evict_inode: inode is dirty, ino:%" PRIino "u", + "f2fs_evict_inode: inode is dirty, ino:%llu", inode->i_ino); f2fs_inode_synced(inode); set_sbi_flag(sbi, SBI_NEED_FSCK); diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c index e230bc84fc62b5049963b928affd801c28e1ba58..efbb0732d4206f63b5221605a08ffa5c17e8a8b6 100644 --- a/fs/f2fs/namei.c +++ b/fs/f2fs/namei.c @@ -505,7 +505,7 @@ static struct dentry *f2fs_lookup(struct inode *dir, struct dentry *dentry, } if (inode->i_nlink == 0) { - f2fs_warn(F2FS_I_SB(inode), "%s: inode (ino=%" PRIino "x) has zero i_nlink", + f2fs_warn(F2FS_I_SB(inode), "%s: inode (ino=%llx) has zero i_nlink", __func__, inode->i_ino); err = -EFSCORRUPTED; set_sbi_flag(F2FS_I_SB(inode), SBI_NEED_FSCK); @@ -515,7 +515,7 @@ static struct dentry *f2fs_lookup(struct inode *dir, struct dentry *dentry, if (IS_ENCRYPTED(dir) && (S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode)) && !fscrypt_has_permitted_context(dir, inode)) { - f2fs_warn(F2FS_I_SB(inode), "Inconsistent encryption contexts: %" PRIino "u/%" PRIino "u", + f2fs_warn(F2FS_I_SB(inode), "Inconsistent encryption contexts: %llu/%llu", dir->i_ino, inode->i_ino); err = -EPERM; goto out_iput; @@ -573,11 +573,11 @@ static int f2fs_unlink(struct inode *dir, struct dentry *dentry) } if (unlikely(inode->i_nlink == 0)) { - f2fs_warn(sbi, "%s: inode (ino=%" PRIino "x) has zero i_nlink", + f2fs_warn(sbi, "%s: inode (ino=%llx) has zero i_nlink", __func__, inode->i_ino); goto corrupted; } else if (S_ISDIR(inode->i_mode) && unlikely(inode->i_nlink == 1)) { - f2fs_warn(sbi, "%s: directory inode (ino=%" PRIino "x) has a single i_nlink", + f2fs_warn(sbi, "%s: directory inode (ino=%llx) has a single i_nlink", __func__, inode->i_ino); goto corrupted; } diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index 89d85faa615249a716e9eb56861ace6eac9d5d8f..2856d5dbdd00a659b548ca6a0d8a973fc1341297 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c @@ -847,7 +847,7 @@ int f2fs_get_dnode_of_data(struct dnode_of_data *dn, pgoff_t index, int mode) err = -EFSCORRUPTED; f2fs_err_ratelimited(sbi, "inode mapping table is corrupted, run fsck to fix it, " - "ino:%" PRIino "u, nid:%u, level:%d, offset:%d", + "ino:%llu, nid:%u, level:%d, offset:%d", dn->inode->i_ino, nids[i], level, offset[level]); set_sbi_flag(sbi, SBI_NEED_FSCK); goto release_pages; @@ -1013,7 +1013,7 @@ static int truncate_dnode(struct dnode_of_data *dn) return PTR_ERR(folio); if (IS_INODE(folio) || ino_of_node(folio) != dn->inode->i_ino) { - f2fs_err(sbi, "incorrect node reference, ino: %" PRIino "u, nid: %u, ino_of_node: %u", + f2fs_err(sbi, "incorrect node reference, ino: %llu, nid: %u, ino_of_node: %u", dn->inode->i_ino, dn->nid, ino_of_node(folio)); set_sbi_flag(sbi, SBI_NEED_FSCK); f2fs_handle_error(sbi, ERROR_INVALID_NODE_REFERENCE); @@ -1194,7 +1194,7 @@ int f2fs_truncate_inode_blocks(struct inode *inode, pgoff_t from) if (level <= 0) { if (!level) { level = -EFSCORRUPTED; - f2fs_err(sbi, "%s: inode ino=%" PRIino "x has corrupted node block, from:%lu addrs:%u", + f2fs_err(sbi, "%s: inode ino=%llx has corrupted node block, from:%lu addrs:%u", __func__, inode->i_ino, from, ADDRS_PER_INODE(inode)); set_sbi_flag(sbi, SBI_NEED_FSCK); @@ -1265,7 +1265,7 @@ int f2fs_truncate_inode_blocks(struct inode *inode, pgoff_t from) set_sbi_flag(F2FS_F_SB(folio), SBI_NEED_FSCK); f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR); f2fs_err_ratelimited(sbi, - "truncate node fail, ino:%" PRIino "u, nid:%u, " + "truncate node fail, ino:%llu, nid:%u, " "offset[0]:%d, offset[1]:%d, nofs:%d", inode->i_ino, dn.nid, offset[0], offset[1], nofs); @@ -1351,7 +1351,7 @@ int f2fs_remove_inode_page(struct inode *inode) if (unlikely(inode->i_blocks != 0 && inode->i_blocks != 8)) { f2fs_warn(F2FS_I_SB(inode), - "f2fs_remove_inode_page: inconsistent i_blocks, ino:%" PRIino "u, iblocks:%llu", + "f2fs_remove_inode_page: inconsistent i_blocks, ino:%llu, iblocks:%llu", inode->i_ino, (unsigned long long)inode->i_blocks); set_sbi_flag(F2FS_I_SB(inode), SBI_NEED_FSCK); } @@ -1997,7 +1997,7 @@ int f2fs_fsync_node_pages(struct f2fs_sb_info *sbi, struct inode *inode, return ret; } -static int f2fs_match_ino(struct inode *inode, kino_t ino, void *data) +static int f2fs_match_ino(struct inode *inode, u64 ino, void *data) { struct f2fs_sb_info *sbi = F2FS_I_SB(inode); bool clean; diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c index 86a9a289bde4ff5087b8ba194691880c9a8b5446..3d3dacec94825f6695d67043fd3ca42329aa5929 100644 --- a/fs/f2fs/recovery.c +++ b/fs/f2fs/recovery.c @@ -232,7 +232,7 @@ static int recover_dentry(struct inode *inode, struct folio *ifolio, name = ""; else name = raw_inode->i_name; - f2fs_notice(F2FS_I_SB(inode), "%s: ino = %x, name = %s, dir = %" PRIino "u, err = %d", + f2fs_notice(F2FS_I_SB(inode), "%s: ino = %x, name = %s, dir = %llu, err = %d", __func__, ino_of_node(ifolio), name, IS_ERR(dir) ? 0 : dir->i_ino, err); return err; @@ -532,7 +532,7 @@ static int check_index_in_prev_nodes(struct f2fs_sb_info *sbi, max_addrs = ADDRS_PER_PAGE(dn->node_folio, dn->inode); if (ofs_in_node >= max_addrs) { - f2fs_err(sbi, "Inconsistent ofs_in_node:%u in summary, ino:%" PRIino "u, nid:%u, max:%u", + f2fs_err(sbi, "Inconsistent ofs_in_node:%u in summary, ino:%llu, nid:%u, max:%u", ofs_in_node, dn->inode->i_ino, nid, max_addrs); f2fs_handle_error(sbi, ERROR_INCONSISTENT_SUMMARY); return -EFSCORRUPTED; @@ -674,7 +674,7 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode, f2fs_bug_on(sbi, ni.ino != ino_of_node(folio)); if (ofs_of_node(dn.node_folio) != ofs_of_node(folio)) { - f2fs_warn(sbi, "Inconsistent ofs_of_node, ino:%" PRIino "u, ofs:%u, %u", + f2fs_warn(sbi, "Inconsistent ofs_of_node, ino:%llu, ofs:%u, %u", inode->i_ino, ofs_of_node(dn.node_folio), ofs_of_node(folio)); err = -EFSCORRUPTED; @@ -748,7 +748,7 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode, if (f2fs_is_valid_blkaddr(sbi, dest, DATA_GENERIC_ENHANCE_UPDATE)) { - f2fs_err(sbi, "Inconsistent dest blkaddr:%u, ino:%" PRIino "u, ofs:%u", + f2fs_err(sbi, "Inconsistent dest blkaddr:%u, ino:%llu, ofs:%u", dest, inode->i_ino, dn.ofs_in_node); err = -EFSCORRUPTED; goto err; @@ -768,7 +768,7 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode, err: f2fs_put_dnode(&dn); out: - f2fs_notice(sbi, "recover_data: ino = %" PRIino "x, nid = %x (i_size: %s), " + f2fs_notice(sbi, "recover_data: ino = %llx, nid = %x (i_size: %s), " "range (%u, %u), recovered = %d, err = %d", inode->i_ino, nid_of_node(folio), file_keep_isize(inode) ? "keep" : "recover", diff --git a/fs/f2fs/xattr.c b/fs/f2fs/xattr.c index 03a33b5acb5df1244de72d91731a94cbb2142503..610d5810074dc501d02c93a4feb308e12a21a056 100644 --- a/fs/f2fs/xattr.c +++ b/fs/f2fs/xattr.c @@ -365,7 +365,7 @@ static int lookup_all_xattrs(struct inode *inode, struct folio *ifolio, *xe = __find_xattr(cur_addr, last_txattr_addr, NULL, index, len, name); if (!*xe) { - f2fs_err(F2FS_I_SB(inode), "lookup inode (%" PRIino "u) has corrupted xattr", + f2fs_err(F2FS_I_SB(inode), "lookup inode (%llu) has corrupted xattr", inode->i_ino); set_sbi_flag(F2FS_I_SB(inode), SBI_NEED_FSCK); err = -ENODATA; @@ -585,7 +585,7 @@ ssize_t f2fs_listxattr(struct dentry *dentry, char *buffer, size_t buffer_size) if ((void *)(entry) + sizeof(__u32) > last_base_addr || (void *)XATTR_NEXT_ENTRY(entry) > last_base_addr) { - f2fs_err(F2FS_I_SB(inode), "list inode (%" PRIino "u) has corrupted xattr", + f2fs_err(F2FS_I_SB(inode), "list inode (%llu) has corrupted xattr", inode->i_ino); set_sbi_flag(F2FS_I_SB(inode), SBI_NEED_FSCK); f2fs_handle_error(F2FS_I_SB(inode), @@ -664,14 +664,14 @@ static int __f2fs_setxattr(struct inode *inode, int index, if (!F2FS_I(inode)->i_xattr_nid) { error = f2fs_recover_xattr_data(inode, NULL); f2fs_notice(F2FS_I_SB(inode), - "recover xattr in inode (%" PRIino "u), error(%d)", + "recover xattr in inode (%llu), error(%d)", inode->i_ino, error); if (!error) { kfree(base_addr); goto retry; } } - f2fs_err(F2FS_I_SB(inode), "set inode (%" PRIino "u) has corrupted xattr", + f2fs_err(F2FS_I_SB(inode), "set inode (%llu) has corrupted xattr", inode->i_ino); set_sbi_flag(F2FS_I_SB(inode), SBI_NEED_FSCK); error = -EFSCORRUPTED; @@ -699,7 +699,7 @@ static int __f2fs_setxattr(struct inode *inode, int index, while (!IS_XATTR_LAST_ENTRY(last)) { if ((void *)(last) + sizeof(__u32) > last_base_addr || (void *)XATTR_NEXT_ENTRY(last) > last_base_addr) { - f2fs_err(F2FS_I_SB(inode), "inode (%" PRIino "u) has invalid last xattr entry, entry_size: %zu", + f2fs_err(F2FS_I_SB(inode), "inode (%llu) has invalid last xattr entry, entry_size: %zu", inode->i_ino, ENTRY_SIZE(last)); set_sbi_flag(F2FS_I_SB(inode), SBI_NEED_FSCK); error = -EFSCORRUPTED; -- 2.53.0