From nobody Tue Mar 3 05:07:05 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 08DBF48A2A7; Mon, 2 Mar 2026 20:35:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772483749; cv=none; b=uJknzTOoZ1w10nNTiOIH9ayNRct8Gz+obheHbrRAzMSfzOGdYR5puuOb0k4o6TdZhYKEYcvda9101JQRFYfvZRG7jy/hBD5zKHE9wuKZCx1/FHF/pFUaQEqk+pN09vvOeVWrslusRtFb2iJcrT0V4oXIgt3UVTShbbsIROcYNYw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772483749; c=relaxed/simple; bh=Vblf53wnflobV1sY2YHbURgI/PfiT/3CadtF+Sa/Hf0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Q8247hNnyGXBmXRuzgbbg67RE+SctT4Rwo25NnsK+xd3jaiA3RM4lCXERaXRJh6y0iXv9/n8ofM5F5zjlDs4nEPEmGvpqyDdnSDsCIerRBJGPk07I0AoYZ1ZkXjJFvcsErmIm0GJS3vPlYe0ipRjPWHLa4IhJwuFCT5KajzM5MU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RMsxDiV+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="RMsxDiV+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AC52CC19425; Mon, 2 Mar 2026 20:35:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772483747; bh=Vblf53wnflobV1sY2YHbURgI/PfiT/3CadtF+Sa/Hf0=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=RMsxDiV+sm+EXqFxHAbiFx2JYBbwuxbe9DrafO9YDSX68UcTN3B5teVyI2vROaDnp 3WTo2NmhCir2A2yu8chTmj9NQSBlmN6tYcZToxe/rxInx/oiV0nxxRWDI255r8ovLn Vs3vUyLaMSUf5Lam8QMZJr7/B91vUtD1T+F4UMIUpNvXX2hqCQnSMxMPzJ6IE9AuiN 7J/8RCsJ6AZVyKMRdMzAQmkyDIHUtJMoIbCq901F/cysRHciOl5FVuFjRprrmu9gw/ bVuoUKYrxSTUtsLeLR4FKbhu+zXuT30betLzh/olc8Ryjt27KP5AqS2xGnooSjQUs+ RiPcNnkWAeAdg== From: Jeff Layton Date: Mon, 02 Mar 2026 15:24:29 -0500 Subject: [PATCH v2 045/110] ubifs: use PRIino format for i_ino Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260302-iino-u64-v2-45-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=21308; i=jlayton@kernel.org; h=from:subject:message-id; bh=Vblf53wnflobV1sY2YHbURgI/PfiT/3CadtF+Sa/Hf0=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBppfH6/nY2nQKgLDOrzw4T4jktGxbZ0XJ3Nyeo4 a9nl2QuwT+JAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaaXx+gAKCRAADmhBGVaC FRHHD/9C7sNOkZiWSrZi2V4t2bWnk9mmoD45dkQmMikxUe/NmmDxb1G9zUiklM72Ef+ioMuTcyZ R4JaJOwdggD1jVyWlX5m23j0qNm/J47KnuQsiSlcilft7vKmUio1tr05zUGnVoccth4jrbnfYBS NVnq8NMtSKEZL/Sy7Y9j8u+svQMVrbdClGCg1xE9QTMNLjRzcW/fTvjZO5Iyv2rBenqc/FCzHmA Lra/1qHyOiQLuZs7Pi1V9Rl9Gk9bpUZFwg1qs4x1G7jWyPX3n4mM6+yA1tdGWkQJxNQ3dTTOd9b JFOhVrybVi3gHEyXZ58/HaOyMjoAtypsnZW3Qqw0A6Byb4fveOpzTdfNyrpW90Js8GzNFxowyvY cfsypHL0g2KjAojOrsDSBIRuL1a0OVNoWKRr9cyneGYKPPCk2bQXfVzwJaZSH/i4cSeaPdBMudV ph6kG56lYX4PNRYC60FjZ22I7wnuOzb7qmTwK8bKTDu7szFK+Qo3FkMZu+IHIhKH3dZYSlXhhrt 1FM9YYkvOaqvlPV32PwkxzgFcVpBJwHn87E24hlk9MWfc4+lHCEtJ4cs6/tqMlzmCmxBhPaPgSe xUG7ppgMbLst0JBkv2EgoVjdOSQAO4334OhB+/JzRskk/1cyhPY3yIS9xfJihT858Pp0KM1nGHT YGmJfPu81JS+aNQ== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Convert ubifs i_ino format strings to use the PRIino format macro in preparation for the widening of i_ino via kino_t. Remove now-unnecessary (unsigned long) casts on i_ino. Signed-off-by: Jeff Layton --- fs/ubifs/debug.c | 8 ++++---- fs/ubifs/dir.c | 28 ++++++++++++++-------------- fs/ubifs/file.c | 28 ++++++++++++++-------------- fs/ubifs/journal.c | 6 +++--- fs/ubifs/super.c | 16 ++++++++-------- fs/ubifs/tnc.c | 4 ++-- fs/ubifs/xattr.c | 14 +++++++------- 7 files changed, 52 insertions(+), 52 deletions(-) diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c index 160c16aa7b6e7088355582670357262ab3930225..c7c7dbf0e4c546c7213effa5c84= 9dbba0532f9ed 100644 --- a/fs/ubifs/debug.c +++ b/fs/ubifs/debug.c @@ -230,7 +230,7 @@ void ubifs_dump_inode(struct ubifs_info *c, const struc= t inode *inode) int count =3D 2; =20 pr_err("Dump in-memory inode:"); - pr_err("\tinode %lu\n", inode->i_ino); + pr_err("\tinode %" PRIino "u\n", inode->i_ino); pr_err("\tsize %llu\n", (unsigned long long)i_size_read(inode)); pr_err("\tnlink %u\n", inode->i_nlink); @@ -1101,7 +1101,7 @@ int dbg_check_synced_i_size(const struct ubifs_info *= c, struct inode *inode) if (ui->ui_size !=3D ui->synced_i_size && !ui->dirty) { ubifs_err(c, "ui_size is %lld, synced_i_size is %lld, but inode is clean= ", ui->ui_size, ui->synced_i_size); - ubifs_err(c, "i_ino %lu, i_mode %#x, i_size %lld", inode->i_ino, + ubifs_err(c, "i_ino %" PRIino "u, i_mode %#x, i_size %lld", inode->i_ino, inode->i_mode, i_size_read(inode)); dump_stack(); err =3D -EINVAL; @@ -1163,7 +1163,7 @@ int dbg_check_dir(struct ubifs_info *c, const struct = inode *dir) kfree(pdent); =20 if (i_size_read(dir) !=3D size) { - ubifs_err(c, "directory inode %lu has size %llu, but calculated size is = %llu", + ubifs_err(c, "directory inode %" PRIino "u has size %llu, but calculated= size is %llu", dir->i_ino, (unsigned long long)i_size_read(dir), (unsigned long long)size); ubifs_dump_inode(c, dir); @@ -1171,7 +1171,7 @@ int dbg_check_dir(struct ubifs_info *c, const struct = inode *dir) return -EINVAL; } if (dir->i_nlink !=3D nlink) { - ubifs_err(c, "directory inode %lu has nlink %u, but calculated nlink is = %u", + ubifs_err(c, "directory inode %" PRIino "u has nlink %u, but calculated = nlink is %u", dir->i_ino, dir->i_nlink, nlink); ubifs_dump_inode(c, dir); dump_stack(); diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index 4c9f57f3b2adbbd396b288878cb18fa87cdbd0df..8197948e490d6e5cea9ddd31b44= 562462cafb9b4 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c @@ -223,7 +223,7 @@ static struct dentry *ubifs_lookup(struct inode *dir, s= truct dentry *dentry, struct ubifs_info *c =3D dir->i_sb->s_fs_info; struct fscrypt_name nm; =20 - dbg_gen("'%pd' in dir ino %lu", dentry, dir->i_ino); + dbg_gen("'%pd' in dir ino %" PRIino "u", dentry, dir->i_ino); =20 err =3D fscrypt_prepare_lookup(dir, dentry, &nm); if (err =3D=3D -ENOENT) @@ -281,7 +281,7 @@ static struct dentry *ubifs_lookup(struct inode *dir, s= truct dentry *dentry, if (IS_ENCRYPTED(dir) && (S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode)) && !fscrypt_has_permitted_context(dir, inode)) { - ubifs_warn(c, "Inconsistent encryption contexts: %lu/%lu", + ubifs_warn(c, "Inconsistent encryption contexts: %" PRIino "u/%" PRIino = "u", dir->i_ino, inode->i_ino); iput(inode); inode =3D ERR_PTR(-EPERM); @@ -318,7 +318,7 @@ static int ubifs_create(struct mnt_idmap *idmap, struct= inode *dir, * parent directory inode. */ =20 - dbg_gen("dent '%pd', mode %#hx in dir ino %lu", + dbg_gen("dent '%pd', mode %#hx in dir ino %" PRIino "u", dentry, mode, dir->i_ino); =20 err =3D ubifs_budget_space(c, &req); @@ -386,7 +386,7 @@ static struct inode *create_whiteout(struct inode *dir,= struct dentry *dentry) * atomically. */ =20 - dbg_gen("dent '%pd', mode %#hx in dir ino %lu", + dbg_gen("dent '%pd', mode %#hx in dir ino %" PRIino "u", dentry, mode, dir->i_ino); =20 inode =3D ubifs_new_inode(c, dir, mode, false); @@ -460,7 +460,7 @@ static int ubifs_tmpfile(struct mnt_idmap *idmap, struc= t inode *dir, * be released via writeback. */ =20 - dbg_gen("dent '%pd', mode %#hx in dir ino %lu", + dbg_gen("dent '%pd', mode %#hx in dir ino %" PRIino "u", dentry, mode, dir->i_ino); =20 err =3D fscrypt_setup_filename(dir, &dentry->d_name, 0, &nm); @@ -589,7 +589,7 @@ static int ubifs_readdir(struct file *file, struct dir_= context *ctx) bool encrypted =3D IS_ENCRYPTED(dir); struct ubifs_dir_data *data =3D file->private_data; =20 - dbg_gen("dir ino %lu, f_pos %#llx", dir->i_ino, ctx->pos); + dbg_gen("dir ino %" PRIino "u, f_pos %#llx", dir->i_ino, ctx->pos); =20 if (ctx->pos > UBIFS_S_KEY_HASH_MASK || ctx->pos =3D=3D 2) /* @@ -764,7 +764,7 @@ static int ubifs_link(struct dentry *old_dentry, struct= inode *dir, * changing the parent inode. */ =20 - dbg_gen("dent '%pd' to ino %lu (nlink %d) in dir ino %lu", + dbg_gen("dent '%pd' to ino %" PRIino "u (nlink %d) in dir ino %" PRIino "= u", dentry, inode->i_ino, inode->i_nlink, dir->i_ino); ubifs_assert(c, inode_is_locked(dir)); @@ -836,7 +836,7 @@ static int ubifs_unlink(struct inode *dir, struct dentr= y *dentry) * deletions. */ =20 - dbg_gen("dent '%pd' from ino %lu (nlink %d) in dir ino %lu", + dbg_gen("dent '%pd' from ino %" PRIino "u (nlink %d) in dir ino %" PRIino= "u", dentry, inode->i_ino, inode->i_nlink, dir->i_ino); =20 @@ -941,7 +941,7 @@ static int ubifs_rmdir(struct inode *dir, struct dentry= *dentry) * because we have extra space reserved for deletions. */ =20 - dbg_gen("directory '%pd', ino %lu in dir ino %lu", dentry, + dbg_gen("directory '%pd', ino %" PRIino "u in dir ino %" PRIino "u", dent= ry, inode->i_ino, dir->i_ino); ubifs_assert(c, inode_is_locked(dir)); ubifs_assert(c, inode_is_locked(inode)); @@ -1018,7 +1018,7 @@ static struct dentry *ubifs_mkdir(struct mnt_idmap *i= dmap, struct inode *dir, * directory inode. */ =20 - dbg_gen("dent '%pd', mode %#hx in dir ino %lu", + dbg_gen("dent '%pd', mode %#hx in dir ino %" PRIino "u", dentry, mode, dir->i_ino); =20 err =3D ubifs_budget_space(c, &req); @@ -1096,7 +1096,7 @@ static int ubifs_mknod(struct mnt_idmap *idmap, struc= t inode *dir, * directory inode. */ =20 - dbg_gen("dent '%pd' in dir ino %lu", dentry, dir->i_ino); + dbg_gen("dent '%pd' in dir ino %" PRIino "u", dentry, dir->i_ino); =20 if (S_ISBLK(mode) || S_ISCHR(mode)) { dev =3D kmalloc_obj(union ubifs_dev_desc, GFP_NOFS); @@ -1183,7 +1183,7 @@ static int ubifs_symlink(struct mnt_idmap *idmap, str= uct inode *dir, .dirtied_ino =3D 1 }; struct fscrypt_name nm; =20 - dbg_gen("dent '%pd', target '%s' in dir ino %lu", dentry, + dbg_gen("dent '%pd', target '%s' in dir ino %" PRIino "u", dentry, symname, dir->i_ino); =20 err =3D fscrypt_prepare_symlink(dir, symname, len, UBIFS_MAX_INO_DATA, @@ -1349,7 +1349,7 @@ static int do_rename(struct inode *old_dir, struct de= ntry *old_dentry, * ino_req: marks the target inode as dirty and does not write it. */ =20 - dbg_gen("dent '%pd' ino %lu in dir ino %lu to dent '%pd' in dir ino %lu f= lags 0x%x", + dbg_gen("dent '%pd' ino %" PRIino "u in dir ino %" PRIino "u to dent '%pd= ' in dir ino %" PRIino "u flags 0x%x", old_dentry, old_inode->i_ino, old_dir->i_ino, new_dentry, new_dir->i_ino, flags); =20 @@ -1597,7 +1597,7 @@ static int ubifs_xrename(struct inode *old_dir, struc= t dentry *old_dentry, * parent directory inodes. */ =20 - dbg_gen("dent '%pd' ino %lu in dir ino %lu exchange dent '%pd' ino %lu in= dir ino %lu", + dbg_gen("dent '%pd' ino %" PRIino "u in dir ino %" PRIino "u exchange den= t '%pd' ino %" PRIino "u in dir ino %" PRIino "u", old_dentry, fst_inode->i_ino, old_dir->i_ino, new_dentry, snd_inode->i_ino, new_dir->i_ino); =20 diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c index cd04755e792a7f8e7d33ed4e67806cd202c71fad..90248f5a91cdd71a9d3c353a5cd= 8d1f95377fddc 100644 --- a/fs/ubifs/file.c +++ b/fs/ubifs/file.c @@ -90,7 +90,7 @@ static int read_block(struct inode *inode, struct folio *= folio, size_t offset, return 0; =20 dump: - ubifs_err(c, "bad data node (block %u, inode %lu)", + ubifs_err(c, "bad data node (block %u, inode %" PRIino "u)", block, inode->i_ino); ubifs_dump_node(c, dn, UBIFS_MAX_DATA_NODE_SZ); return -EINVAL; @@ -106,7 +106,7 @@ static int do_readpage(struct folio *folio) loff_t i_size =3D i_size_read(inode); size_t offset =3D 0; =20 - dbg_gen("ino %lu, pg %lu, i_size %lld, flags %#lx", + dbg_gen("ino %" PRIino "u, pg %lu, i_size %lld, flags %#lx", inode->i_ino, folio->index, i_size, folio->flags.f); ubifs_assert(c, !folio_test_checked(folio)); ubifs_assert(c, !folio->private); @@ -162,7 +162,7 @@ static int do_readpage(struct folio *folio) dbg_gen("hole"); err =3D 0; } else { - ubifs_err(c, "cannot read page %lu of inode %lu, error %d", + ubifs_err(c, "cannot read page %lu of inode %" PRIino "u, error %d", folio->index, inode->i_ino, err); } } @@ -212,7 +212,7 @@ static int write_begin_slow(struct address_space *mappi= ng, int err, appending =3D !!(pos + len > inode->i_size); struct folio *folio; =20 - dbg_gen("ino %lu, pos %llu, len %u, i_size %lld", + dbg_gen("ino %" PRIino "u, pos %llu, len %u, i_size %lld", inode->i_ino, pos, len, inode->i_size); =20 /* @@ -526,7 +526,7 @@ static int ubifs_write_end(const struct kiocb *iocb, loff_t end_pos =3D pos + len; int appending =3D !!(end_pos > inode->i_size); =20 - dbg_gen("ino %lu, pos %llu, pg %lu, len %u, copied %d, i_size %lld", + dbg_gen("ino %" PRIino "u, pos %llu, pg %lu, len %u, copied %d, i_size %l= ld", inode->i_ino, pos, folio->index, len, copied, inode->i_size); =20 if (unlikely(copied < len && !folio_test_uptodate(folio))) { @@ -599,7 +599,7 @@ static int populate_page(struct ubifs_info *c, struct f= olio *folio, size_t offset =3D 0; pgoff_t end_index; =20 - dbg_gen("ino %lu, pg %lu, i_size %lld, flags %#lx", + dbg_gen("ino %" PRIino "u, pg %lu, i_size %lld, flags %#lx", inode->i_ino, folio->index, i_size, folio->flags.f); =20 end_index =3D (i_size - 1) >> PAGE_SHIFT; @@ -680,7 +680,7 @@ static int populate_page(struct ubifs_info *c, struct f= olio *folio, return 0; =20 out_err: - ubifs_err(c, "bad data node (block %u, inode %lu)", + ubifs_err(c, "bad data node (block %u, inode %" PRIino "u)", page_block, inode->i_ino); return -EINVAL; } @@ -913,7 +913,7 @@ static int do_writepage(struct folio *folio, size_t len) } if (err) { mapping_set_error(folio->mapping, err); - ubifs_err(c, "cannot write folio %lu of inode %lu, error %d", + ubifs_err(c, "cannot write folio %lu of inode %" PRIino "u, error %d", folio->index, inode->i_ino, err); ubifs_ro_mode(c, err); } @@ -987,7 +987,7 @@ static int ubifs_writepage(struct folio *folio, struct = writeback_control *wbc) loff_t i_size =3D i_size_read(inode), synced_i_size; int err, len =3D folio_size(folio); =20 - dbg_gen("ino %lu, pg %lu, pg flags %#lx", + dbg_gen("ino %" PRIino "u, pg %lu, pg flags %#lx", inode->i_ino, folio->index, folio->flags.f); ubifs_assert(c, folio->private !=3D NULL); =20 @@ -1106,7 +1106,7 @@ static int do_truncation(struct ubifs_info *c, struct= inode *inode, int offset =3D new_size & (UBIFS_BLOCK_SIZE - 1), budgeted =3D 1; struct ubifs_inode *ui =3D ubifs_inode(inode); =20 - dbg_gen("ino %lu, size %lld -> %lld", inode->i_ino, old_size, new_size); + dbg_gen("ino %" PRIino "u, size %lld -> %lld", inode->i_ino, old_size, ne= w_size); memset(&req, 0, sizeof(struct ubifs_budget_req)); =20 /* @@ -1258,7 +1258,7 @@ int ubifs_setattr(struct mnt_idmap *idmap, struct den= try *dentry, struct inode *inode =3D d_inode(dentry); struct ubifs_info *c =3D inode->i_sb->s_fs_info; =20 - dbg_gen("ino %lu, mode %#x, ia_valid %#x", + dbg_gen("ino %" PRIino "u, mode %#x, ia_valid %#x", inode->i_ino, inode->i_mode, attr->ia_valid); err =3D setattr_prepare(&nop_mnt_idmap, dentry, attr); if (err) @@ -1308,7 +1308,7 @@ int ubifs_fsync(struct file *file, loff_t start, loff= _t end, int datasync) struct ubifs_info *c =3D inode->i_sb->s_fs_info; int err; =20 - dbg_gen("syncing inode %lu", inode->i_ino); + dbg_gen("syncing inode %" PRIino "u", inode->i_ino); =20 if (c->ro_mount) /* @@ -1495,7 +1495,7 @@ static vm_fault_t ubifs_vm_page_mkwrite(struct vm_fau= lt *vmf) struct ubifs_budget_req req =3D { .new_page =3D 1 }; int err, update_time; =20 - dbg_gen("ino %lu, pg %lu, i_size %lld", inode->i_ino, folio->index, + dbg_gen("ino %" PRIino "u, pg %lu, i_size %lld", inode->i_ino, folio->ind= ex, i_size_read(inode)); ubifs_assert(c, !c->ro_media && !c->ro_mount); =20 @@ -1531,7 +1531,7 @@ static vm_fault_t ubifs_vm_page_mkwrite(struct vm_fau= lt *vmf) err =3D ubifs_budget_space(c, &req); if (unlikely(err)) { if (err =3D=3D -ENOSPC) - ubifs_warn(c, "out of space for mmapped file (inode number %lu)", + ubifs_warn(c, "out of space for mmapped file (inode number %" PRIino "u= )", inode->i_ino); return VM_FAULT_SIGBUS; } diff --git a/fs/ubifs/journal.c b/fs/ubifs/journal.c index e28ab4395e5ca404d8e8d8f735c3113b58bcc941..7c4edfe98d13245982353d42231= d4d87806ca50d 100644 --- a/fs/ubifs/journal.c +++ b/fs/ubifs/journal.c @@ -982,7 +982,7 @@ int ubifs_jnl_write_inode(struct ubifs_info *c, const s= truct inode *inode) int kill_xattrs =3D ui->xattr_cnt && last_reference; u8 hash[UBIFS_HASH_ARR_SZ]; =20 - dbg_jnl("ino %lu, nlink %u", inode->i_ino, inode->i_nlink); + dbg_jnl("ino %" PRIino "u, nlink %u", inode->i_ino, inode->i_nlink); =20 if (kill_xattrs && ui->xattr_cnt > ubifs_xattr_max_cnt(c)) { ubifs_err(c, "Cannot delete inode, it has too many xattrs!"); @@ -1743,7 +1743,7 @@ int ubifs_jnl_truncate(struct ubifs_info *c, const st= ruct inode *inode, int dn_len =3D le32_to_cpu(dn->size); =20 if (dn_len <=3D 0 || dn_len > UBIFS_BLOCK_SIZE) { - ubifs_err(c, "bad data node (block %u, inode %lu)", + ubifs_err(c, "bad data node (block %u, inode %" PRIino "u)", blk, inode->i_ino); ubifs_dump_node(c, dn, dn_size); err =3D -EUCLEAN; @@ -1987,7 +1987,7 @@ int ubifs_jnl_change_xattr(struct ubifs_info *c, cons= t struct inode *inode, u8 hash_host[UBIFS_HASH_ARR_SZ]; u8 hash[UBIFS_HASH_ARR_SZ]; =20 - dbg_jnl("ino %lu, ino %lu", host->i_ino, inode->i_ino); + dbg_jnl("ino %" PRIino "u, ino %" PRIino "u", host->i_ino, inode->i_ino); ubifs_assert(c, inode->i_nlink > 0); ubifs_assert(c, mutex_is_locked(&host_ui->ui_mutex)); =20 diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index 03bf924756ca003809d229837a970d5935450f23..c6dcb62827f3da0f6dd021c5c06= 2059afd56ca00 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -92,7 +92,7 @@ static int validate_inode(struct ubifs_info *c, const str= uct inode *inode) return 5; =20 if (!ubifs_compr_present(c, ui->compr_type)) { - ubifs_warn(c, "inode %lu uses '%s' compression, but it was not compiled = in", + ubifs_warn(c, "inode %" PRIino "u uses '%s' compression, but it was not = compiled in", inode->i_ino, ubifs_compr_name(c, ui->compr_type)); } =20 @@ -248,14 +248,14 @@ struct inode *ubifs_iget(struct super_block *sb, unsi= gned long inum) return inode; =20 out_invalid: - ubifs_err(c, "inode %lu validation failed, error %d", inode->i_ino, err); + ubifs_err(c, "inode %" PRIino "u validation failed, error %d", inode->i_i= no, err); ubifs_dump_node(c, ino, UBIFS_MAX_INO_NODE_SZ); ubifs_dump_inode(c, inode); err =3D -EINVAL; out_ino: kfree(ino); out: - ubifs_err(c, "failed to read inode %lu, error %d", inode->i_ino, err); + ubifs_err(c, "failed to read inode %" PRIino "u, error %d", inode->i_ino,= err); iget_failed(inode); return ERR_PTR(err); } @@ -316,12 +316,12 @@ static int ubifs_write_inode(struct inode *inode, str= uct writeback_control *wbc) * As an optimization, do not write orphan inodes to the media just * because this is not needed. */ - dbg_gen("inode %lu, mode %#x, nlink %u", + dbg_gen("inode %" PRIino "u, mode %#x, nlink %u", inode->i_ino, (int)inode->i_mode, inode->i_nlink); if (inode->i_nlink) { err =3D ubifs_jnl_write_inode(c, inode); if (err) - ubifs_err(c, "can't write inode %lu, error %d", + ubifs_err(c, "can't write inode %" PRIino "u, error %d", inode->i_ino, err); else err =3D dbg_check_inode_size(c, inode, ui->ui_size); @@ -357,7 +357,7 @@ static void ubifs_evict_inode(struct inode *inode) */ goto out; =20 - dbg_gen("inode %lu, mode %#x", inode->i_ino, (int)inode->i_mode); + dbg_gen("inode %" PRIino "u, mode %#x", inode->i_ino, (int)inode->i_mode); ubifs_assert(c, !icount_read(inode)); =20 truncate_inode_pages_final(&inode->i_data); @@ -375,7 +375,7 @@ static void ubifs_evict_inode(struct inode *inode) * Worst case we have a lost orphan inode wasting space, so a * simple error message is OK here. */ - ubifs_err(c, "can't delete inode %lu, error %d", + ubifs_err(c, "can't delete inode %" PRIino "u, error %d", inode->i_ino, err); =20 out: @@ -399,7 +399,7 @@ static void ubifs_dirty_inode(struct inode *inode, int = flags) ubifs_assert(c, mutex_is_locked(&ui->ui_mutex)); if (!ui->dirty) { ui->dirty =3D 1; - dbg_gen("inode %lu", inode->i_ino); + dbg_gen("inode %" PRIino "u", inode->i_ino); } } =20 diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c index 694b08d27d7d9c7d9d7d9039f406637c702f8613..67836e71f698ea60fa1e0622ddf= 2fb59c95ff757 100644 --- a/fs/ubifs/tnc.c +++ b/fs/ubifs/tnc.c @@ -3561,8 +3561,8 @@ int dbg_check_inode_size(struct ubifs_info *c, const = struct inode *inode, =20 out_dump: block =3D key_block(c, key); - ubifs_err(c, "inode %lu has size %lld, but there are data at offset %lld", - (unsigned long)inode->i_ino, size, + ubifs_err(c, "inode %" PRIino "u has size %lld, but there are data at off= set %lld", + inode->i_ino, size, ((loff_t)block) << UBIFS_BLOCK_SHIFT); mutex_unlock(&c->tnc_mutex); ubifs_dump_inode(c, inode); diff --git a/fs/ubifs/xattr.c b/fs/ubifs/xattr.c index c21a0c2b3e907c1572780d4a3e48cc9d2a11b9d6..c070b658bd05baab3921a8d3fd8= 448639ac0e08b 100644 --- a/fs/ubifs/xattr.c +++ b/fs/ubifs/xattr.c @@ -76,7 +76,7 @@ static int create_xattr(struct ubifs_info *c, struct inod= e *host, .dirtied_ino_d =3D ALIGN(host_ui->data_len, 8) }; =20 if (host_ui->xattr_cnt >=3D ubifs_xattr_max_cnt(c)) { - ubifs_err(c, "inode %lu already has too many xattrs (%d), cannot create = more", + ubifs_err(c, "inode %" PRIino "u already has too many xattrs (%d), canno= t create more", host->i_ino, host_ui->xattr_cnt); return -ENOSPC; } @@ -88,7 +88,7 @@ static int create_xattr(struct ubifs_info *c, struct inod= e *host, */ names_len =3D host_ui->xattr_names + host_ui->xattr_cnt + fname_len(nm) += 1; if (names_len > XATTR_LIST_MAX) { - ubifs_err(c, "cannot add one more xattr name to inode %lu, total names l= ength would become %d, max. is %d", + ubifs_err(c, "cannot add one more xattr name to inode %" PRIino "u, tota= l names length would become %d, max. is %d", host->i_ino, names_len, XATTR_LIST_MAX); return -ENOSPC; } @@ -390,7 +390,7 @@ ssize_t ubifs_listxattr(struct dentry *dentry, char *bu= ffer, size_t size) int err, len, written =3D 0; struct fscrypt_name nm =3D {0}; =20 - dbg_gen("ino %lu ('%pd'), buffer size %zd", host->i_ino, + dbg_gen("ino %" PRIino "u ('%pd'), buffer size %zd", host->i_ino, dentry, size); =20 down_read(&host_ui->xattr_sem); @@ -498,7 +498,7 @@ int ubifs_purge_xattrs(struct inode *host) if (ubifs_inode(host)->xattr_cnt <=3D ubifs_xattr_max_cnt(c)) return 0; =20 - ubifs_warn(c, "inode %lu has too many xattrs, doing a non-atomic deletion= ", + ubifs_warn(c, "inode %" PRIino "u has too many xattrs, doing a non-atomic= deletion", host->i_ino); =20 down_write(&ubifs_inode(host)->xattr_sem); @@ -641,7 +641,7 @@ int ubifs_init_security(struct inode *dentry, struct in= ode *inode, &init_xattrs, NULL); if (err) { struct ubifs_info *c =3D dentry->i_sb->s_fs_info; - ubifs_err(c, "cannot initialize security for inode %lu, error %d", + ubifs_err(c, "cannot initialize security for inode %" PRIino "u, error %= d", inode->i_ino, err); } return err; @@ -652,7 +652,7 @@ static int xattr_get(const struct xattr_handler *handle= r, struct dentry *dentry, struct inode *inode, const char *name, void *buffer, size_t size) { - dbg_gen("xattr '%s', ino %lu ('%pd'), buf size %zd", name, + dbg_gen("xattr '%s', ino %" PRIino "u ('%pd'), buf size %zd", name, inode->i_ino, dentry, size); =20 name =3D xattr_full_name(handler, name); @@ -665,7 +665,7 @@ static int xattr_set(const struct xattr_handler *handle= r, const char *name, const void *value, size_t size, int flags) { - dbg_gen("xattr '%s', host ino %lu ('%pd'), size %zd", + dbg_gen("xattr '%s', host ino %" PRIino "u ('%pd'), size %zd", name, inode->i_ino, dentry, size); =20 name =3D xattr_full_name(handler, name); --=20 2.53.0