From nobody Tue Mar 3 05:05:57 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 6BFB538D003; Mon, 2 Mar 2026 20:27:10 +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=1772483230; cv=none; b=GgodYxvURej+S0rAlygDcNF/c06OmnCflJeIcJRzJXIjIHU9pkACkuBKl/9BgDJVAgVvMGRCR3V7g2M5sd23YraWL3HXRRrezqqtDjXTE6uNZCQEJmh5fVOugBoBNZmcDeVea3x8PBLoea2l6f/qdVuKCnvg+Xnm2H9mBmb13YA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772483230; c=relaxed/simple; bh=+Is++TjQpl6u/U6HxX5Z4Emfb01du7HSFQWc+jMowkQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JlSOhigzjGOLtEKnViGGQkAETtngZvkLLsnLPOtDkOH16ZxJX6JdRtJFS8JTD+zv0dXQSCthIShT1r84hWvB4tigcvQynPlPLYd3ujBpH0M75mTry8bxCVOJ1TWtf2g6iu8NEuFizpqMLkmNJ0ZUVI1PeZjCvnZVbIFEn8mNDHg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gIYtAssi; 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="gIYtAssi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EE723C2BCB8; Mon, 2 Mar 2026 20:26:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772483230; bh=+Is++TjQpl6u/U6HxX5Z4Emfb01du7HSFQWc+jMowkQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=gIYtAssiHRdLKqiLiZX7AajtkK+0ksYQnuS7GSlkey1EB6nQvE5jbEEE719ybY/7i kmNs5S6XPnc7wkyGeQkn6RC71bMXxkcm6DAsB9Yfc19XzuFBhdQWXZrjCsTwQqogPP iR9h6+v9CPu/AlX4bHaVep5PeVGD5px8L2eUoiJk4hq7SJiKxA5yckrR7cIyaJPXP1 /mFbIdI2KunwYYhh/FNas+dFbnHSbw/Ahd1SsCmgUfR4bqPO7nYXHV6VlPvL3lljk7 BgKEG6laRUsze8s3j4rYjfV5CKNhFTnMIe+SdAReIB3gmekocqBRJVmj1Sixgobk3N +Q/Zx+BUqyfNg== From: Jeff Layton Date: Mon, 02 Mar 2026 15:23:53 -0500 Subject: [PATCH v2 009/110] f2fs: 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-9-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=51905; i=jlayton@kernel.org; h=from:subject:message-id; bh=+Is++TjQpl6u/U6HxX5Z4Emfb01du7HSFQWc+jMowkQ=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBppfHxYLQ4t2EkRoC4MxHhICFE3/4eV0T9/QC/N nqR8RLpznuJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaaXx8QAKCRAADmhBGVaC FWrKD/wNteXDS14nplFpxjS8M7CYebxWbIkaYeMA6bc6JQlPhFCkPHA/ZVpQ8Evz+YV8Fw92MXl JNnrty418dIAiOqNdhadt+VHISJsq9Gq/SEET4tLC3+LiZTT7wPd9qQroQvpXMZiZC1AVscEAgO 4iEPyMThdMHqcpkLzrPTtba8hKYsU/h/c8roLOFnKpnIBH/2SOWDZx80tgqKxAjrVIY1Rx3iOZ8 /M2EM87T5UtZrbnAterK8BspZ1z6oXrLcWfRMpMrB59eZi5phFlFfKRjFP2mC0SsWHQ9JUUD5K9 1ORFcKl2iNZQ+ATizU7RltgwJ4FG6yEK3lIiZ+bTw1Ba3XX745lh5K4+C7UomsK7/PHxw1VW28q pqDW8s1xhuldMx3sZpHmhCuylhN4td3wWpl/S8zAOIKaee8btk4dr9fY7P5Oic3L4hOQI8yH0Fi 0GIn7QUJE05jb9W12PSLwrXw4bX5HiwOrxjD7Cqd0jzjXwatwARDWjm7Cc34ZbOx2LvV3JgtZ+b bhNdISA026g7gBEHZTl/wrjk4S4kAk+mitTInEAVHOtBBQgEC2xOGAs3i/UVxRvhGqqJ59qM3b2 LcM+1x/WNg4CRIj+ZlWNbralQ1nAWybNZIE0D9rGNChHnLxvq4WKwGApqP3TYYgzQ0ky48nWlAY bStIvW8V+2oxuRQ== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Convert f2fs i_ino format strings to use the PRIino format macro in preparation for the widening of i_ino via kino_t. In trace events, change __field(ino_t, ...) to __field(u64, ...) and update TP_printk format strings to %llu/%llx to match the widened field type. Update local variables and function parameters that hold i_ino values from unsigned long to kino_t. 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 +-- include/trace/events/f2fs.h | 172 ++++++++++++++++++++++------------------= ---- 13 files changed, 149 insertions(+), 149 deletions(-) diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c index 8c76400ba6317d9b62428a1d7b53a54d7c5d07ef..04ca483017a4db4ffe5ba21674a= f969ccb3d4ef3 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 =3D %lu, %x vs %x", + "checksum invalid, nid =3D %" PRIino "u, %x vs %x", dic->inode->i_ino, provided, calculated); } @@ -932,7 +932,7 @@ bool f2fs_sanity_check_cluster(struct dnode_of_data *dn) =20 return false; out: - f2fs_warn(sbi, "access invalid cluster, ino:%lu, nid:%u, ofs_in_node:%u, = reason:%s", + f2fs_warn(sbi, "access invalid cluster, ino:%" PRIino "u, 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 f70092e231f0f47e589d648b0c6f83ef3aa8fd6c..d8ddf530663c9f30af0243bfaba= b2c169951ddc8 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, =20 max_depth =3D F2FS_I(dir)->i_current_depth; if (unlikely(max_depth > MAX_DIR_HASH_DEPTH)) { - f2fs_warn(F2FS_I_SB(dir), "Corrupted max_depth of %lu: %u", + f2fs_warn(F2FS_I_SB(dir), "Corrupted max_depth of %" PRIino "u: %u", dir->i_ino, max_depth); max_depth =3D 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 0ed84cc065a7eda66c50eae97d70e9ab93de31c3..45c098b1f89f47aecd6354ecf2d= 4803abb275480 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, struc= t 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=3D%lx) extent info [%u, %u, %u] is incorr= ect, run fsck to fix", + f2fs_warn(sbi, "%s: inode (ino=3D%" PRIino "x) 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, str= uct folio *ifolio) =20 if (devi =3D=3D 0) { f2fs_warn(sbi, - "%s: inode (ino=3D%lx) is an alias of meta device", + "%s: inode (ino=3D%" PRIino "x) is an alias of meta device", __func__, inode->i_ino); return false; } =20 if (bdev_is_zoned(FDEV(devi).bdev)) { f2fs_warn(sbi, - "%s: device alias inode (ino=3D%lx)'s extent info " + "%s: device alias inode (ino=3D%" PRIino "x)'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, struc= t folio *ifolio) return true; } =20 - f2fs_warn(sbi, "%s: device alias inode (ino=3D%lx)'s extent info " + f2fs_warn(sbi, "%s: device alias inode (ino=3D%" PRIino "x)'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 bb34e864d0efc742c651a285c5989bd73530fbe3..c5d175b6eab52bd366bbef870d5= 4d13f35c8fe00 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, =20 spin_lock(&sbi->stat_lock); if (unlikely(sbi->total_valid_block_count < count)) { - f2fs_warn(sbi, "Inconsistent total_valid_block_count:%u, ino:%lu, count:= %u", + f2fs_warn(sbi, "Inconsistent total_valid_block_count:%u, ino:%" PRIino "= u, count:%u", sbi->total_valid_block_count, inode->i_ino, count); sbi->total_valid_block_count =3D 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:%lu, iblocks:%llu, sectors:%l= lu", + f2fs_warn(sbi, "Inconsistent i_blocks, ino:%" PRIino "u, iblocks:%llu, s= ectors:%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_s= b_info *sbi, dquot_free_inode(inode); } else { if (unlikely(inode->i_blocks =3D=3D 0)) { - f2fs_warn(sbi, "dec_valid_node_count: inconsistent i_blocks, ino:%lu, i= blocks:%llu", + f2fs_warn(sbi, "dec_valid_node_count: inconsistent i_blocks, ino:%" PRI= ino "u, 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 c8a2f17a8f11cfc746c6a6ec4a225199929c2ee6..2029fc802669700c7b29cdb04ca= 022dec6632fd2 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 =3D -ENOSPC; f2fs_warn_ratelimited(sbi, - "ino:%lu, start:%lu, end:%lu, need to trigger GC to " + "ino:%" PRIino "u, 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 *f= ilp, bool truncate) * f2fs_is_atomic_file. */ if (get_dirty_pages(inode)) - f2fs_warn(sbi, "Unexpected flush for atomic writes: ino=3D%lu, npages=3D= %u", + f2fs_warn(sbi, "Unexpected flush for atomic writes: ino=3D%" PRIino "u, = npages=3D%u", inode->i_ino, get_dirty_pages(inode)); ret =3D 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 i= nc) return -EINVAL; =20 if (fi->i_gc_failures >=3D sbi->gc_pin_file_threshold) { - f2fs_warn(sbi, "%s: Enable GC =3D ino %lx after %x GC trials", + f2fs_warn(sbi, "%s: Enable GC =3D ino %" PRIino "x 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) =20 if (!f2fs_sb_has_verity(F2FS_I_SB(inode))) { f2fs_warn(F2FS_I_SB(inode), - "Can't enable fs-verity on inode %lu: the verity feature is not enabl= ed on this filesystem", + "Can't enable fs-verity on inode %" PRIino "u: 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=3D%lx " + f2fs_warn(sbi, "%s: partial blocks were released i_ino=3D%" PRIino "x " "iblocks=3D%llu, released=3D%u, compr_blocks=3D%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=3D%lx " + f2fs_warn(sbi, "%s: partial blocks were reserved i_ino=3D%" PRIino "x " "iblocks=3D%llu, reserved=3D%u, compr_blocks=3D%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 f46b2673d31f5a334bac543947e713cfe85dc68a..c7efb7807e9c276d60b65768fb0= c98f405345af0 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 %lx has both inline_data flag and " + "inode %" PRIino "u has both inline_data flag and " "data block, nid=3D%u, ofs_in_node=3D%u", inode->i_ino, dni.nid, ofs_in_node); continue; diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c index 0a1052d5ee624e68ba27200b100a567a5d216f2a..33f434a7031b725816b7a71359d= aeffa4c8c6af9 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 !=3D NEW_ADDR)) { f2fs_put_dnode(dn); set_sbi_flag(fio.sbi, SBI_NEED_FSCK); - f2fs_warn(fio.sbi, "%s: corrupted inline inode ino=3D%lx, i_addr[0]:0x%x= , run fsck to fix.", + f2fs_warn(fio.sbi, "%s: corrupted inline inode ino=3D%" PRIino "u, i_add= r[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 !=3D 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=3D%lx, i_add= r[0]:0x%x, run fsck to fix.", + f2fs_warn(F2FS_F_SB(folio), "%s: corrupted inline inode ino=3D%" PRIino = "u, 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 =3D -EFSCORRUPTED; diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c index e0f850b3f0c38797fbba726af424161a147ee4f7..e3fb676b417bcc63e23137949e2= 6f68ccce09cb4 100644 --- a/fs/f2fs/inode.c +++ b/fs/f2fs/inode.c @@ -203,14 +203,14 @@ static bool sanity_check_compress_inode(struct inode = *inode, =20 if (ri->i_compress_algorithm >=3D COMPRESS_MAX) { f2fs_warn(sbi, - "%s: inode (ino=3D%lx) has unsupported compress algorithm: %u, run fsck= to fix", + "%s: inode (ino=3D%" PRIino "x) 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=3D%lx) has inconsistent i_compr_blocks:%llu, i_blocks:%= llu, run fsck to fix", + "%s: inode (ino=3D%" PRIino "x) 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 *i= node, 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=3D%lx) has unsupported log cluster size: %u, run fsck t= o fix", + "%s: inode (ino=3D%" PRIino "x) has unsupported log cluster size: %u, r= un 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 *i= node, =20 return true; err_level: - f2fs_warn(sbi, "%s: inode (ino=3D%lx) has unsupported compress level: %u,= run fsck to fix", + f2fs_warn(sbi, "%s: inode (ino=3D%" PRIino "x) has unsupported compress l= evel: %u, run fsck to fix", __func__, inode->i_ino, clevel); return false; } @@ -276,40 +276,40 @@ static bool sanity_check_inode(struct inode *inode, s= truct folio *node_folio) =20 iblocks =3D le64_to_cpu(F2FS_INODE(node_folio)->i_blocks); if (!iblocks) { - f2fs_warn(sbi, "%s: corrupted inode i_blocks i_ino=3D%lx iblocks=3D%llu,= run fsck to fix.", + f2fs_warn(sbi, "%s: corrupted inode i_blocks i_ino=3D%" PRIino "x iblock= s=3D%llu, run fsck to fix.", __func__, inode->i_ino, iblocks); return false; } =20 if (ino_of_node(node_folio) !=3D nid_of_node(node_folio)) { - f2fs_warn(sbi, "%s: corrupted inode footer i_ino=3D%lx, ino,nid: [%u, %u= ] run fsck to fix.", + f2fs_warn(sbi, "%s: corrupted inode footer i_ino=3D%" PRIino "x, ino,nid= : [%u, %u] run fsck to fix.", __func__, inode->i_ino, ino_of_node(node_folio), nid_of_node(node_folio)); return false; } =20 if (ino_of_node(node_folio) =3D=3D fi->i_xattr_nid) { - f2fs_warn(sbi, "%s: corrupted inode i_ino=3D%lx, xnid=3D%x, run fsck to = fix.", + f2fs_warn(sbi, "%s: corrupted inode i_ino=3D%" PRIino "x, xnid=3D%x, run= fsck to fix.", __func__, inode->i_ino, fi->i_xattr_nid); return false; } =20 if (S_ISDIR(inode->i_mode) && unlikely(inode->i_nlink =3D=3D 1)) { - f2fs_warn(sbi, "%s: directory inode (ino=3D%lx) has a single i_nlink", + f2fs_warn(sbi, "%s: directory inode (ino=3D%" PRIino "x) has a single i_= nlink", __func__, inode->i_ino); return false; } =20 if (f2fs_has_extra_attr(inode)) { if (!f2fs_sb_has_extra_attr(sbi)) { - f2fs_warn(sbi, "%s: inode (ino=3D%lx) is with extra_attr, but extra_att= r feature is off", + f2fs_warn(sbi, "%s: inode (ino=3D%" PRIino "x) 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=3D%lx) has corrupted i_extra_isize: %d, = max: %zu", + f2fs_warn(sbi, "%s: inode (ino=3D%" PRIino "x) has corrupted i_extra_is= ize: %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, str= uct 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=3D%lx) has corrupted i_inline_xattr_size:= %d, min: %zu, max: %lu", + f2fs_warn(sbi, "%s: inode (ino=3D%" PRIino "x) has corrupted i_inline_xa= ttr_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, s= truct folio *node_folio) =20 if (!f2fs_sb_has_extra_attr(sbi)) { if (f2fs_sb_has_project_quota(sbi)) { - f2fs_warn(sbi, "%s: corrupted inode ino=3D%lx, wrong feature flag: %u, = run fsck to fix.", + f2fs_warn(sbi, "%s: corrupted inode ino=3D%" PRIino "x, wrong feature f= lag: %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=3D%lx, wrong feature flag: %u, = run fsck to fix.", + f2fs_warn(sbi, "%s: corrupted inode ino=3D%" PRIino "x, wrong feature f= lag: %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=3D%lx, wrong feature flag: %u, = run fsck to fix.", + f2fs_warn(sbi, "%s: corrupted inode ino=3D%" PRIino "x, wrong feature f= lag: %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=3D%lx, wrong feature flag: %u, = run fsck to fix.", + f2fs_warn(sbi, "%s: corrupted inode ino=3D%" PRIino "x, wrong feature f= lag: %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=3D%lx, wrong feature flag: %u, = run fsck to fix.", + f2fs_warn(sbi, "%s: corrupted inode ino=3D%" PRIino "x, wrong feature f= lag: %u, run fsck to fix.", __func__, inode->i_ino, F2FS_FEATURE_COMPRESSION); return false; } } =20 if (f2fs_sanity_check_inline_data(inode, node_folio)) { - f2fs_warn(sbi, "%s: inode (ino=3D%lx, mode=3D%u) should not have inline_= data, run fsck to fix", + f2fs_warn(sbi, "%s: inode (ino=3D%" PRIino "x, mode=3D%u) should not hav= e inline_data, run fsck to fix", __func__, inode->i_ino, inode->i_mode); return false; } =20 if (f2fs_has_inline_dentry(inode) && !S_ISDIR(inode->i_mode)) { - f2fs_warn(sbi, "%s: inode (ino=3D%lx, mode=3D%u) should not have inline_= dentry, run fsck to fix", + f2fs_warn(sbi, "%s: inode (ino=3D%" PRIino "x, mode=3D%u) should not hav= e inline_dentry, run fsck to fix", __func__, inode->i_ino, inode->i_mode); return false; } =20 if ((fi->i_flags & F2FS_CASEFOLD_FL) && !f2fs_sb_has_casefold(sbi)) { - f2fs_warn(sbi, "%s: inode (ino=3D%lx) has casefold flag, but casefold fe= ature is off", + f2fs_warn(sbi, "%s: inode (ino=3D%" PRIino "x) has casefold flag, but ca= sefold feature is off", __func__, inode->i_ino); return false; } =20 if (fi->i_xattr_nid && f2fs_check_nid_range(sbi, fi->i_xattr_nid)) { - f2fs_warn(sbi, "%s: inode (ino=3D%lx) has corrupted i_xattr_nid: %u, run= fsck to fix.", + f2fs_warn(sbi, "%s: inode (ino=3D%" PRIino "x) has corrupted i_xattr_nid= : %u, run fsck to fix.", __func__, inode->i_ino, fi->i_xattr_nid); return false; } =20 if (IS_DEVICE_ALIASING(inode)) { if (!f2fs_sb_has_device_alias(sbi)) { - f2fs_warn(sbi, "%s: inode (ino=3D%lx) has device alias flag, but the fe= ature is off", + f2fs_warn(sbi, "%s: inode (ino=3D%" PRIino "x) has device alias flag, b= ut the feature is off", __func__, inode->i_ino); return false; } if (!f2fs_is_pinned_file(inode)) { - f2fs_warn(sbi, "%s: inode (ino=3D%lx) has device alias flag, but is not= pinned", + f2fs_warn(sbi, "%s: inode (ino=3D%" PRIino "x) has device alias flag, b= ut 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:%lu", + "f2fs_evict_inode: inconsistent node id, ino:%" PRIino "u", 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:%lu", + "f2fs_evict_inode: inode is dirty, ino:%" PRIino "u", 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 e360f08a9586ab5b75d6e1e1748219c3190a7580..e230bc84fc62b5049963b928aff= d801c28e1ba58 100644 --- a/fs/f2fs/namei.c +++ b/fs/f2fs/namei.c @@ -505,7 +505,7 @@ static struct dentry *f2fs_lookup(struct inode *dir, st= ruct dentry *dentry, } =20 if (inode->i_nlink =3D=3D 0) { - f2fs_warn(F2FS_I_SB(inode), "%s: inode (ino=3D%lx) has zero i_nlink", + f2fs_warn(F2FS_I_SB(inode), "%s: inode (ino=3D%" PRIino "x) has zero i_n= link", __func__, inode->i_ino); err =3D -EFSCORRUPTED; set_sbi_flag(F2FS_I_SB(inode), SBI_NEED_FSCK); @@ -515,7 +515,7 @@ static struct dentry *f2fs_lookup(struct inode *dir, st= ruct 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: %lu/%lu", + f2fs_warn(F2FS_I_SB(inode), "Inconsistent encryption contexts: %" PRIino= "u/%" PRIino "u", dir->i_ino, inode->i_ino); err =3D -EPERM; goto out_iput; @@ -573,11 +573,11 @@ static int f2fs_unlink(struct inode *dir, struct dent= ry *dentry) } =20 if (unlikely(inode->i_nlink =3D=3D 0)) { - f2fs_warn(sbi, "%s: inode (ino=3D%lx) has zero i_nlink", + f2fs_warn(sbi, "%s: inode (ino=3D%" PRIino "x) has zero i_nlink", __func__, inode->i_ino); goto corrupted; } else if (S_ISDIR(inode->i_mode) && unlikely(inode->i_nlink =3D=3D 1)) { - f2fs_warn(sbi, "%s: directory inode (ino=3D%lx) has a single i_nlink", + f2fs_warn(sbi, "%s: directory inode (ino=3D%" PRIino "x) has a single i_= nlink", __func__, inode->i_ino); goto corrupted; } diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index 2030e943ab9b3d5e2deb20efe9a44cf5093a61fb..89d85faa615249a716e9eb56861= ace6eac9d5d8f 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, pg= off_t index, int mode) err =3D -EFSCORRUPTED; f2fs_err_ratelimited(sbi, "inode mapping table is corrupted, run fsck to fix it, " - "ino:%lu, nid:%u, level:%d, offset:%d", + "ino:%" PRIino "u, 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); =20 if (IS_INODE(folio) || ino_of_node(folio) !=3D dn->inode->i_ino) { - f2fs_err(sbi, "incorrect node reference, ino: %lu, nid: %u, ino_of_node:= %u", + f2fs_err(sbi, "incorrect node reference, ino: %" PRIino "u, 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, p= goff_t from) if (level <=3D 0) { if (!level) { level =3D -EFSCORRUPTED; - f2fs_err(sbi, "%s: inode ino=3D%lx has corrupted node block, from:%lu a= ddrs:%u", + f2fs_err(sbi, "%s: inode ino=3D%" PRIino "x has corrupted node block, f= rom:%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, p= goff_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:%lu, nid:%u, " + "truncate node fail, ino:%" PRIino "u, 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) =20 if (unlikely(inode->i_blocks !=3D 0 && inode->i_blocks !=3D 8)) { f2fs_warn(F2FS_I_SB(inode), - "f2fs_remove_inode_page: inconsistent i_blocks, ino:%lu, iblocks:%llu", + "f2fs_remove_inode_page: inconsistent i_blocks, ino:%" PRIino "u, ibloc= ks:%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, s= truct inode *inode, return ret; } =20 -static int f2fs_match_ino(struct inode *inode, unsigned long ino, void *da= ta) +static int f2fs_match_ino(struct inode *inode, kino_t ino, void *data) { struct f2fs_sb_info *sbi =3D F2FS_I_SB(inode); bool clean; diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c index a26071f2b0bc81fb768982841e37a63b2ca701b3..86a9a289bde4ff5087b8ba19469= 1880c9a8b5446 100644 --- a/fs/f2fs/recovery.c +++ b/fs/f2fs/recovery.c @@ -232,7 +232,7 @@ static int recover_dentry(struct inode *inode, struct f= olio *ifolio, name =3D ""; else name =3D raw_inode->i_name; - f2fs_notice(F2FS_I_SB(inode), "%s: ino =3D %x, name =3D %s, dir =3D %lx, = err =3D %d", + f2fs_notice(F2FS_I_SB(inode), "%s: ino =3D %x, name =3D %s, dir =3D %" PR= Iino "u, err =3D %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_inf= o *sbi, =20 max_addrs =3D ADDRS_PER_PAGE(dn->node_folio, dn->inode); if (ofs_in_node >=3D max_addrs) { - f2fs_err(sbi, "Inconsistent ofs_in_node:%u in summary, ino:%lu, nid:%u, = max:%u", + f2fs_err(sbi, "Inconsistent ofs_in_node:%u in summary, ino:%" PRIino "u,= 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, st= ruct inode *inode, f2fs_bug_on(sbi, ni.ino !=3D ino_of_node(folio)); =20 if (ofs_of_node(dn.node_folio) !=3D ofs_of_node(folio)) { - f2fs_warn(sbi, "Inconsistent ofs_of_node, ino:%lu, ofs:%u, %u", + f2fs_warn(sbi, "Inconsistent ofs_of_node, ino:%" PRIino "u, ofs:%u, %u", inode->i_ino, ofs_of_node(dn.node_folio), ofs_of_node(folio)); err =3D -EFSCORRUPTED; @@ -748,7 +748,7 @@ static int do_recover_data(struct f2fs_sb_info *sbi, st= ruct inode *inode, =20 if (f2fs_is_valid_blkaddr(sbi, dest, DATA_GENERIC_ENHANCE_UPDATE)) { - f2fs_err(sbi, "Inconsistent dest blkaddr:%u, ino:%lu, ofs:%u", + f2fs_err(sbi, "Inconsistent dest blkaddr:%u, ino:%" PRIino "u, ofs:%u", dest, inode->i_ino, dn.ofs_in_node); err =3D -EFSCORRUPTED; goto err; @@ -768,7 +768,7 @@ static int do_recover_data(struct f2fs_sb_info *sbi, st= ruct inode *inode, err: f2fs_put_dnode(&dn); out: - f2fs_notice(sbi, "recover_data: ino =3D %lx, nid =3D %x (i_size: %s), " + f2fs_notice(sbi, "recover_data: ino =3D %" PRIino "x, nid =3D %x (i_size:= %s), " "range (%u, %u), recovered =3D %d, err =3D %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 941dc62a6d6f7c50c1a661397ef1bbb611e6c304..03a33b5acb5df1244de72d91731= a94cbb2142503 100644 --- a/fs/f2fs/xattr.c +++ b/fs/f2fs/xattr.c @@ -365,7 +365,7 @@ static int lookup_all_xattrs(struct inode *inode, struc= t folio *ifolio, =20 *xe =3D __find_xattr(cur_addr, last_txattr_addr, NULL, index, len, name); if (!*xe) { - f2fs_err(F2FS_I_SB(inode), "lookup inode (%lu) has corrupted xattr", + f2fs_err(F2FS_I_SB(inode), "lookup inode (%" PRIino "u) has corrupted xa= ttr", inode->i_ino); set_sbi_flag(F2FS_I_SB(inode), SBI_NEED_FSCK); err =3D -ENODATA; @@ -585,7 +585,7 @@ ssize_t f2fs_listxattr(struct dentry *dentry, char *buf= fer, size_t buffer_size) =20 if ((void *)(entry) + sizeof(__u32) > last_base_addr || (void *)XATTR_NEXT_ENTRY(entry) > last_base_addr) { - f2fs_err(F2FS_I_SB(inode), "list inode (%lu) has corrupted xattr", + f2fs_err(F2FS_I_SB(inode), "list inode (%" PRIino "u) has corrupted xat= tr", 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 i= ndex, if (!F2FS_I(inode)->i_xattr_nid) { error =3D f2fs_recover_xattr_data(inode, NULL); f2fs_notice(F2FS_I_SB(inode), - "recover xattr in inode (%lu), error(%d)", + "recover xattr in inode (%" PRIino "u), error(%d)", inode->i_ino, error); if (!error) { kfree(base_addr); goto retry; } } - f2fs_err(F2FS_I_SB(inode), "set inode (%lu) has corrupted xattr", + f2fs_err(F2FS_I_SB(inode), "set inode (%" PRIino "u) has corrupted xattr= ", inode->i_ino); set_sbi_flag(F2FS_I_SB(inode), SBI_NEED_FSCK); error =3D -EFSCORRUPTED; @@ -699,7 +699,7 @@ static int __f2fs_setxattr(struct inode *inode, int ind= ex, 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 (%lu) has invalid last xattr entry, e= ntry_size: %zu", + f2fs_err(F2FS_I_SB(inode), "inode (%" PRIino "u) 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 =3D -EFSCORRUPTED; diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h index 9364e677556207ac041353a9eb2d5c2ee49b9dff..d47541216589a366653ccedb38b= 909e28e616f31 100644 --- a/include/trace/events/f2fs.h +++ b/include/trace/events/f2fs.h @@ -9,7 +9,7 @@ #include =20 #define show_dev(dev) MAJOR(dev), MINOR(dev) -#define show_dev_ino(entry) show_dev(entry->dev), (unsigned long)entry->ino +#define show_dev_ino(entry) show_dev(entry->dev), (unsigned long long)entr= y->ino =20 TRACE_DEFINE_ENUM(NODE); TRACE_DEFINE_ENUM(DATA); @@ -207,8 +207,8 @@ DECLARE_EVENT_CLASS(f2fs__inode, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) - __field(ino_t, pino) + __field(u64, ino) + __field(u64, pino) __field(umode_t, mode) __field(loff_t, size) __field(unsigned int, nlink) @@ -227,10 +227,10 @@ DECLARE_EVENT_CLASS(f2fs__inode, __entry->advise =3D F2FS_I(inode)->i_advise; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, pino =3D %lu, i_mode =3D 0x%hx, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, pino =3D %llu, i_mode =3D 0x%hx= , " "i_size =3D %lld, i_nlink =3D %u, i_blocks =3D %llu, i_advise =3D 0x%x", show_dev_ino(__entry), - (unsigned long)__entry->pino, + __entry->pino, __entry->mode, __entry->size, (unsigned int)__entry->nlink, @@ -246,7 +246,7 @@ DECLARE_EVENT_CLASS(f2fs__inode_exit, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(umode_t, mode) __field(int, ret) ), @@ -258,7 +258,7 @@ DECLARE_EVENT_CLASS(f2fs__inode_exit, __entry->ret =3D ret; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, type: %s, mode =3D 0%o, ret =3D = %d", + TP_printk("dev =3D (%d,%d), ino =3D %llu, type: %s, mode =3D 0%o, ret =3D= %d", show_dev_ino(__entry), show_inode_type(__entry->mode & S_IFMT), __entry->mode & S_ALL_PERM, @@ -280,7 +280,7 @@ TRACE_EVENT(f2fs_sync_file_exit, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(int, cp_reason) __field(int, datasync) __field(int, ret) @@ -294,7 +294,7 @@ TRACE_EVENT(f2fs_sync_file_exit, __entry->ret =3D ret; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, cp_reason: %s, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, cp_reason: %s, " "datasync =3D %d, ret =3D %d", show_dev_ino(__entry), show_fsync_cpreason(__entry->cp_reason), @@ -362,7 +362,7 @@ TRACE_EVENT(f2fs_unlink_enter, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(loff_t, size) __field(blkcnt_t, blocks) __string(name, dentry->d_name.name) @@ -376,7 +376,7 @@ TRACE_EVENT(f2fs_unlink_enter, __assign_str(name); ), =20 - TP_printk("dev =3D (%d,%d), dir ino =3D %lu, i_size =3D %lld, " + TP_printk("dev =3D (%d,%d), dir ino =3D %llu, i_size =3D %lld, " "i_blocks =3D %llu, name =3D %s", show_dev_ino(__entry), __entry->size, @@ -413,7 +413,7 @@ TRACE_EVENT(f2fs_truncate_data_blocks_range, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(nid_t, nid) __field(unsigned int, ofs) __field(int, free) @@ -427,7 +427,7 @@ TRACE_EVENT(f2fs_truncate_data_blocks_range, __entry->free =3D free; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, nid =3D %u, offset =3D %u, freed= =3D %d", + TP_printk("dev =3D (%d,%d), ino =3D %llu, nid =3D %u, offset =3D %u, free= d =3D %d", show_dev_ino(__entry), (unsigned int)__entry->nid, __entry->ofs, @@ -442,7 +442,7 @@ DECLARE_EVENT_CLASS(f2fs__truncate_op, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(loff_t, size) __field(blkcnt_t, blocks) __field(u64, from) @@ -456,7 +456,7 @@ DECLARE_EVENT_CLASS(f2fs__truncate_op, __entry->from =3D from; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, i_size =3D %lld, i_blocks =3D %l= lu, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, i_size =3D %lld, i_blocks =3D %= llu, " "start file offset =3D %llu", show_dev_ino(__entry), __entry->size, @@ -500,7 +500,7 @@ DECLARE_EVENT_CLASS(f2fs__truncate_node, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(nid_t, nid) __field(block_t, blk_addr) ), @@ -512,7 +512,7 @@ DECLARE_EVENT_CLASS(f2fs__truncate_node, __entry->blk_addr =3D blk_addr; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, nid =3D %u, block_address =3D 0x= %llx", + TP_printk("dev =3D (%d,%d), ino =3D %llu, nid =3D %u, block_address =3D 0= x%llx", show_dev_ino(__entry), (unsigned int)__entry->nid, (unsigned long long)__entry->blk_addr) @@ -547,7 +547,7 @@ TRACE_EVENT(f2fs_truncate_partial_nodes, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __array(nid_t, nid, 3) __field(int, depth) __field(int, err) @@ -563,7 +563,7 @@ TRACE_EVENT(f2fs_truncate_partial_nodes, __entry->err =3D err; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, " "nid[0] =3D %u, nid[1] =3D %u, nid[2] =3D %u, depth =3D %d, err =3D %d", show_dev_ino(__entry), (unsigned int)__entry->nid[0], @@ -582,7 +582,7 @@ TRACE_EVENT(f2fs_file_write_iter, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(loff_t, offset) __field(size_t, length) __field(ssize_t, ret) @@ -596,7 +596,7 @@ TRACE_EVENT(f2fs_file_write_iter, __entry->ret =3D ret; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, " "offset =3D %lld, length =3D %zu, written(err) =3D %zd", show_dev_ino(__entry), __entry->offset, @@ -612,7 +612,7 @@ TRACE_EVENT(f2fs_fadvise, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(loff_t, size) __field(loff_t, offset) __field(loff_t, len) @@ -628,7 +628,7 @@ TRACE_EVENT(f2fs_fadvise, __entry->advice =3D advice; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, i_size =3D %lld offset:%llu, len= :%llu, advise:%d", + TP_printk("dev =3D (%d,%d), ino =3D %llu, i_size =3D %lld offset:%llu, le= n:%llu, advise:%d", show_dev_ino(__entry), (unsigned long long)__entry->size, __entry->offset, @@ -644,7 +644,7 @@ TRACE_EVENT(f2fs_map_blocks, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(block_t, m_lblk) __field(block_t, m_pblk) __field(unsigned int, m_len) @@ -670,7 +670,7 @@ TRACE_EVENT(f2fs_map_blocks, __entry->ret =3D ret; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, file offset =3D %llu, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, file offset =3D %llu, " "start blkaddr =3D 0x%llx, len =3D 0x%llx, flags =3D %u, " "seg_type =3D %d, may_create =3D %d, multidevice =3D %d, " "flag =3D %d, err =3D %d", @@ -886,7 +886,7 @@ TRACE_EVENT(f2fs_lookup_start, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __string(name, dentry->d_name.name) __field(unsigned int, flags) ), @@ -898,7 +898,7 @@ TRACE_EVENT(f2fs_lookup_start, __entry->flags =3D flags; ), =20 - TP_printk("dev =3D (%d,%d), pino =3D %lu, name:%s, flags:%u", + TP_printk("dev =3D (%d,%d), pino =3D %llu, name:%s, flags:%u", show_dev_ino(__entry), __get_str(name), __entry->flags) @@ -913,7 +913,7 @@ TRACE_EVENT(f2fs_lookup_end, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __string(name, dentry->d_name.name) __field(nid_t, cino) __field(int, err) @@ -927,7 +927,7 @@ TRACE_EVENT(f2fs_lookup_end, __entry->err =3D err; ), =20 - TP_printk("dev =3D (%d,%d), pino =3D %lu, name:%s, ino:%u, err:%d", + TP_printk("dev =3D (%d,%d), pino =3D %llu, name:%s, ino:%u, err:%d", show_dev_ino(__entry), __get_str(name), __entry->cino, @@ -944,9 +944,9 @@ TRACE_EVENT(f2fs_rename_start, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __string(old_name, old_dentry->d_name.name) - __field(ino_t, new_pino) + __field(u64, new_pino) __string(new_name, new_dentry->d_name.name) __field(unsigned int, flags) ), @@ -960,8 +960,8 @@ TRACE_EVENT(f2fs_rename_start, __entry->flags =3D flags; ), =20 - TP_printk("dev =3D (%d,%d), old_dir =3D %lu, old_name: %s, " - "new_dir =3D %lu, new_name: %s, flags =3D %u", + TP_printk("dev =3D (%d,%d), old_dir =3D %llu, old_name: %s, " + "new_dir =3D %llu, new_name: %s, flags =3D %u", show_dev_ino(__entry), __get_str(old_name), __entry->new_pino, @@ -978,7 +978,7 @@ TRACE_EVENT(f2fs_rename_end, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __string(old_name, old_dentry->d_name.name) __string(new_name, new_dentry->d_name.name) __field(unsigned int, flags) @@ -994,7 +994,7 @@ TRACE_EVENT(f2fs_rename_end, __entry->ret =3D ret; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, old_name: %s, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, old_name: %s, " "new_name: %s, flags =3D %u, ret =3D %d", show_dev_ino(__entry), __get_str(old_name), @@ -1011,7 +1011,7 @@ TRACE_EVENT(f2fs_readdir, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(loff_t, start) __field(loff_t, end) __field(int, err) @@ -1025,7 +1025,7 @@ TRACE_EVENT(f2fs_readdir, __entry->err =3D err; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, start_pos:%llu, end_pos:%llu, er= r:%d", + TP_printk("dev =3D (%d,%d), ino =3D %llu, start_pos:%llu, end_pos:%llu, e= rr:%d", show_dev_ino(__entry), __entry->start, __entry->end, @@ -1041,7 +1041,7 @@ TRACE_EVENT(f2fs_fallocate, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(int, mode) __field(loff_t, offset) __field(loff_t, len) @@ -1061,7 +1061,7 @@ TRACE_EVENT(f2fs_fallocate, __entry->ret =3D ret; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, mode =3D %x, offset =3D %lld, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, mode =3D %x, offset =3D %lld, " "len =3D %lld, i_size =3D %lld, i_blocks =3D %llu, ret =3D %d", show_dev_ino(__entry), __entry->mode, @@ -1080,7 +1080,7 @@ TRACE_EVENT(f2fs_direct_IO_enter, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(loff_t, ki_pos) __field(int, ki_flags) __field(u16, ki_ioprio) @@ -1098,7 +1098,7 @@ TRACE_EVENT(f2fs_direct_IO_enter, __entry->rw =3D rw; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu pos =3D %lld len =3D %lu ki_flags= =3D %x ki_ioprio =3D %x rw =3D %d", + TP_printk("dev =3D (%d,%d), ino =3D %llu pos =3D %lld len =3D %lu ki_flag= s =3D %x ki_ioprio =3D %x rw =3D %d", show_dev_ino(__entry), __entry->ki_pos, __entry->len, @@ -1116,7 +1116,7 @@ TRACE_EVENT(f2fs_direct_IO_exit, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(loff_t, pos) __field(unsigned long, len) __field(int, rw) @@ -1132,7 +1132,7 @@ TRACE_EVENT(f2fs_direct_IO_exit, __entry->ret =3D ret; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu pos =3D %lld len =3D %lu " + TP_printk("dev =3D (%d,%d), ino =3D %llu pos =3D %lld len =3D %lu " "rw =3D %d ret =3D %d", show_dev_ino(__entry), __entry->pos, @@ -1177,7 +1177,7 @@ DECLARE_EVENT_CLASS(f2fs__submit_folio_bio, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(pgoff_t, index) __field(block_t, old_blkaddr) __field(block_t, new_blkaddr) @@ -1199,7 +1199,7 @@ DECLARE_EVENT_CLASS(f2fs__submit_folio_bio, __entry->type =3D fio->type; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, folio_index =3D 0x%lx, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, folio_index =3D 0x%lx, " "oldaddr =3D 0x%llx, newaddr =3D 0x%llx, rw =3D %s(%s), type =3D %s_%s", show_dev_ino(__entry), (unsigned long)__entry->index, @@ -1307,7 +1307,7 @@ TRACE_EVENT(f2fs_write_begin, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(loff_t, pos) __field(unsigned int, len) ), @@ -1319,7 +1319,7 @@ TRACE_EVENT(f2fs_write_begin, __entry->len =3D len; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, pos =3D %llu, len =3D %u", + TP_printk("dev =3D (%d,%d), ino =3D %llu, pos =3D %llu, len =3D %u", show_dev_ino(__entry), (unsigned long long)__entry->pos, __entry->len) @@ -1334,7 +1334,7 @@ TRACE_EVENT(f2fs_write_end, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(loff_t, pos) __field(unsigned int, len) __field(unsigned int, copied) @@ -1348,7 +1348,7 @@ TRACE_EVENT(f2fs_write_end, __entry->copied =3D copied; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, pos =3D %llu, len =3D %u, copied= =3D %u", + TP_printk("dev =3D (%d,%d), ino =3D %llu, pos =3D %llu, len =3D %u, copie= d =3D %u", show_dev_ino(__entry), (unsigned long long)__entry->pos, __entry->len, @@ -1363,7 +1363,7 @@ DECLARE_EVENT_CLASS(f2fs__folio, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(int, type) __field(int, dir) __field(pgoff_t, index) @@ -1383,7 +1383,7 @@ DECLARE_EVENT_CLASS(f2fs__folio, __entry->uptodate =3D folio_test_uptodate(folio); ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, %s, %s, index =3D %lu, nr_pages = =3D %lu, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, %s, %s, index =3D %lu, nr_pages= =3D %lu, " "dirty =3D %d, uptodate =3D %d", show_dev_ino(__entry), show_block_type(__entry->type), @@ -1438,8 +1438,8 @@ TRACE_EVENT(f2fs_replace_atomic_write_block, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) - __field(ino_t, cow_ino) + __field(u64, ino) + __field(u64, cow_ino) __field(pgoff_t, index) __field(block_t, old_addr) __field(block_t, new_addr) @@ -1456,7 +1456,7 @@ TRACE_EVENT(f2fs_replace_atomic_write_block, __entry->recovery =3D recovery; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, cow_ino =3D %lu, index =3D %lu, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, cow_ino =3D %llu, index =3D %lu= , " "old_addr =3D 0x%llx, new_addr =3D 0x%llx, recovery =3D %d", show_dev_ino(__entry), __entry->cow_ino, @@ -1475,7 +1475,7 @@ DECLARE_EVENT_CLASS(f2fs_mmap, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(pgoff_t, index) __field(vm_flags_t, flags) __field(vm_fault_t, ret) @@ -1489,7 +1489,7 @@ DECLARE_EVENT_CLASS(f2fs_mmap, __entry->ret =3D ret; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, index =3D %lu, flags: %s, ret: %= s", + TP_printk("dev =3D (%d,%d), ino =3D %llu, index =3D %lu, flags: %s, ret: = %s", show_dev_ino(__entry), (unsigned long)__entry->index, __print_flags(__entry->flags, "|", FAULT_FLAG_TRACE), @@ -1520,7 +1520,7 @@ TRACE_EVENT(f2fs_writepages, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(int, type) __field(int, dir) __field(long, nr_to_write) @@ -1554,7 +1554,7 @@ TRACE_EVENT(f2fs_writepages, __entry->for_sync =3D wbc->for_sync; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, %s, %s, nr_to_write %ld, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, %s, %s, nr_to_write %ld, " "skipped %ld, start %lld, end %lld, wb_idx %lu, sync_mode %d, " "kupdate %u background %u tagged %u cyclic %u sync %u", show_dev_ino(__entry), @@ -1581,7 +1581,7 @@ TRACE_EVENT(f2fs_readpages, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(pgoff_t, start) __field(unsigned int, nrpage) ), @@ -1593,7 +1593,7 @@ TRACE_EVENT(f2fs_readpages, __entry->nrpage =3D nrpage; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, start =3D %lu nrpage =3D %u", + TP_printk("dev =3D (%d,%d), ino =3D %llu, start =3D %lu nrpage =3D %u", show_dev_ino(__entry), (unsigned long)__entry->start, __entry->nrpage) @@ -1739,7 +1739,7 @@ TRACE_EVENT(f2fs_lookup_extent_tree_start, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(unsigned int, pgofs) __field(enum extent_type, type) ), @@ -1751,7 +1751,7 @@ TRACE_EVENT(f2fs_lookup_extent_tree_start, __entry->type =3D type; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, pgofs =3D %u, type =3D %s", + TP_printk("dev =3D (%d,%d), ino =3D %llu, pgofs =3D %u, type =3D %s", show_dev_ino(__entry), __entry->pgofs, show_extent_type(__entry->type)) @@ -1768,7 +1768,7 @@ TRACE_EVENT_CONDITION(f2fs_lookup_read_extent_tree_en= d, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(unsigned int, pgofs) __field(unsigned int, fofs) __field(unsigned int, len) @@ -1784,7 +1784,7 @@ TRACE_EVENT_CONDITION(f2fs_lookup_read_extent_tree_en= d, __entry->blk =3D ei->blk; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, pgofs =3D %u, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, pgofs =3D %u, " "read_ext_info(fofs: %u, len: %u, blk: %u)", show_dev_ino(__entry), __entry->pgofs, @@ -1804,7 +1804,7 @@ TRACE_EVENT_CONDITION(f2fs_lookup_age_extent_tree_end, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(unsigned int, pgofs) __field(unsigned int, fofs) __field(unsigned int, len) @@ -1822,7 +1822,7 @@ TRACE_EVENT_CONDITION(f2fs_lookup_age_extent_tree_end, __entry->blocks =3D ei->last_blocks; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, pgofs =3D %u, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, pgofs =3D %u, " "age_ext_info(fofs: %u, len: %u, age: %llu, blocks: %llu)", show_dev_ino(__entry), __entry->pgofs, @@ -1842,7 +1842,7 @@ TRACE_EVENT(f2fs_update_read_extent_tree_range, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(unsigned int, pgofs) __field(u32, blk) __field(unsigned int, len) @@ -1858,7 +1858,7 @@ TRACE_EVENT(f2fs_update_read_extent_tree_range, __entry->c_len =3D c_len; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, pgofs =3D %u, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, pgofs =3D %u, " "len =3D %u, blkaddr =3D %u, c_len =3D %u", show_dev_ino(__entry), __entry->pgofs, @@ -1877,7 +1877,7 @@ TRACE_EVENT(f2fs_update_age_extent_tree_range, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(unsigned int, pgofs) __field(unsigned int, len) __field(unsigned long long, age) @@ -1893,7 +1893,7 @@ TRACE_EVENT(f2fs_update_age_extent_tree_range, __entry->blocks =3D last_blks; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, pgofs =3D %u, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, pgofs =3D %u, " "len =3D %u, age =3D %llu, blocks =3D %llu", show_dev_ino(__entry), __entry->pgofs, @@ -1939,7 +1939,7 @@ TRACE_EVENT(f2fs_destroy_extent_tree, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(unsigned int, node_cnt) __field(enum extent_type, type) ), @@ -1951,7 +1951,7 @@ TRACE_EVENT(f2fs_destroy_extent_tree, __entry->type =3D type; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, destroyed: node_cnt =3D %u, type= =3D %s", + TP_printk("dev =3D (%d,%d), ino =3D %llu, destroyed: node_cnt =3D %u, typ= e =3D %s", show_dev_ino(__entry), __entry->node_cnt, show_extent_type(__entry->type)) @@ -2028,7 +2028,7 @@ DECLARE_EVENT_CLASS(f2fs_zip_start, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(pgoff_t, idx) __field(unsigned int, size) __field(unsigned int, algtype) @@ -2042,7 +2042,7 @@ DECLARE_EVENT_CLASS(f2fs_zip_start, __entry->algtype =3D algtype; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, cluster_idx:%lu, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, cluster_idx:%lu, " "cluster_size =3D %u, algorithm =3D %s", show_dev_ino(__entry), __entry->idx, @@ -2059,7 +2059,7 @@ DECLARE_EVENT_CLASS(f2fs_zip_end, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(pgoff_t, idx) __field(unsigned int, size) __field(unsigned int, ret) @@ -2073,7 +2073,7 @@ DECLARE_EVENT_CLASS(f2fs_zip_end, __entry->ret =3D ret; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, cluster_idx:%lu, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, cluster_idx:%lu, " "compressed_size =3D %u, ret =3D %d", show_dev_ino(__entry), __entry->idx, @@ -2312,7 +2312,7 @@ TRACE_EVENT(f2fs_bmap, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(sector_t, lblock) __field(sector_t, pblock) ), @@ -2324,7 +2324,7 @@ TRACE_EVENT(f2fs_bmap, __entry->pblock =3D pblock; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, lblock:%lld, pblock:%lld", + TP_printk("dev =3D (%d,%d), ino =3D %llu, lblock:%lld, pblock:%lld", show_dev_ino(__entry), (unsigned long long)__entry->lblock, (unsigned long long)__entry->pblock) @@ -2339,7 +2339,7 @@ TRACE_EVENT(f2fs_fiemap, =20 TP_STRUCT__entry( __field(dev_t, dev) - __field(ino_t, ino) + __field(u64, ino) __field(sector_t, lblock) __field(sector_t, pblock) __field(unsigned long long, len) @@ -2357,7 +2357,7 @@ TRACE_EVENT(f2fs_fiemap, __entry->ret =3D ret; ), =20 - TP_printk("dev =3D (%d,%d), ino =3D %lu, lblock:%lld, pblock:%lld, " + TP_printk("dev =3D (%d,%d), ino =3D %llu, lblock:%lld, pblock:%lld, " "len:%llu, flags:%u, ret:%d", show_dev_ino(__entry), (unsigned long long)__entry->lblock, @@ -2381,7 +2381,7 @@ DECLARE_EVENT_CLASS(f2fs__rw_start, __field(loff_t, i_size) __string(cmdline, command) __field(pid_t, pid) - __field(ino_t, ino) + __field(u64, ino) ), =20 TP_fast_assign( @@ -2402,10 +2402,10 @@ DECLARE_EVENT_CLASS(f2fs__rw_start, ), =20 TP_printk("entry_name %s, offset %llu, bytes %d, cmdline %s," - " pid %d, i_size %llu, ino %lu", + " pid %d, i_size %llu, ino %llu", __get_str(pathbuf), __entry->offset, __entry->bytes, __get_str(cmdline), __entry->pid, __entry->i_size, - (unsigned long) __entry->ino) + __entry->ino) ); =20 DECLARE_EVENT_CLASS(f2fs__rw_end, @@ -2415,7 +2415,7 @@ DECLARE_EVENT_CLASS(f2fs__rw_end, TP_ARGS(inode, offset, bytes), =20 TP_STRUCT__entry( - __field(ino_t, ino) + __field(u64, ino) __field(loff_t, offset) __field(int, bytes) ), @@ -2426,8 +2426,8 @@ DECLARE_EVENT_CLASS(f2fs__rw_end, __entry->bytes =3D bytes; ), =20 - TP_printk("ino %lu, offset %llu, bytes %d", - (unsigned long) __entry->ino, + TP_printk("ino %llu, offset %llu, bytes %d", + __entry->ino, __entry->offset, __entry->bytes) ); =20 --=20 2.53.0