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 5E2EEFD8FCA for ; Thu, 26 Feb 2026 16:06:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BF7B36B0133; Thu, 26 Feb 2026 11:06:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id BCBB56B0135; Thu, 26 Feb 2026 11:06:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A8DB66B0136; Thu, 26 Feb 2026 11:06:34 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 92D5D6B0133 for ; Thu, 26 Feb 2026 11:06:34 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 5BFA61B700E for ; Thu, 26 Feb 2026 16:06:34 +0000 (UTC) X-FDA: 84487085508.22.0896EC4 Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by imf24.hostedemail.com (Postfix) with ESMTP id 8D4F0180011 for ; Thu, 26 Feb 2026 16:06:32 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=kmkL8rma; spf=pass (imf24.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=1772121992; 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=xCcxsByRD0lRlcBXteNEPF1CF9Uxc6r5pH6uSWHt9i4=; b=AeWlQgLwfzRKJfF8Tz6LbwmAHR6B41exsGCG8sI/urTUZx2y+Gn5El0HY+QVUVfTHxVa/e SU0424hEWsmk0yl8a9SJghmPFB93FGJIWvPwwX0wlXs/cV8ohvqhnQII1JdX9VObnrHPJI AjkhAKlVQoEj0D0ntSe5tWeTU3UCArI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1772121992; a=rsa-sha256; cv=none; b=crlP6U/nGigrOx1m9wytegnTo+8d7C1Qn5u0x9lUVdSnYSCLiNj/NOjCSuSF3ojN1sCLo8 orD3sl/BY1YwCaG9U1ISTp3jh2vJpqGyC8neSJ1kQ8bhY29OSTN5fP1JGdMYZVvEs7O/1J tV+k3kPh36ee/gytL1Ms0oke3bs0zWA= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=kmkL8rma; spf=pass (imf24.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 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 9085260137; Thu, 26 Feb 2026 16:06:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ED574C2BCAF; Thu, 26 Feb 2026 16:06:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772121991; bh=UzUJVkE54+5worUh+6CVBOEGlTktcxnLHEhhDzvvwXo=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=kmkL8rmaozr/GXIlU/D7mK8GBNmNhhiV1Q8VAayDic9ByvlDowdpB6ogncyg9UwTh eB4Bkt9hNTQkgrFB3r8PReLXMHxe05on7pqliEoz7iGFB0kzcqew7EKfooZtTC/q/b 2+GnTXGg4O6SOWtV+Fe8HB4W61tD7peqZKcxEz3PejxRcNOmZaCfRDBHNsWSNfedzQ EFNcjkR14TRnUEgdMnm2SqkWGdd7BAj7KDR9jYJyk5bZYwRMg8RAWJMn2SND0n2gSk h/yARg/DV+fMiSaKvZCrWFBIexFCxpRm6k+xA0n59bFkA5KAcDomjBkNRLgD4hDRZU tqWfvejc7L1/Q== From: Jeff Layton Date: Thu, 26 Feb 2026 10:55:51 -0500 Subject: [PATCH 49/61] ufs: update format strings for u64 i_ino MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260226-iino-u64-v1-49-ccceff366db9@kernel.org> References: <20260226-iino-u64-v1-0-ccceff366db9@kernel.org> In-Reply-To: <20260226-iino-u64-v1-0-ccceff366db9@kernel.org> To: Alexander Viro , Christian Brauner , Jan Kara , Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Dan Williams , Matthew Wilcox , Eric Biggers , "Theodore Y. Ts'o" , Muchun Song , Oscar Salvador , David Hildenbrand , David Howells , Paulo Alcantara , Andreas Dilger , Jan Kara , Jaegeuk Kim , Chao Yu , Trond Myklebust , Anna Schumaker , Chuck Lever , NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Steve French , Ronnie Sahlberg , Shyam Prasad N , Bharath SM , Alexander Aring , Ryusuke Konishi , Viacheslav Dubeyko , Eric Van Hensbergen , Latchesar Ionkov , Dominique Martinet , Christian Schoenebeck , David Sterba , Marc Dionne , Ian Kent , Luis de Bethencourt , Salah Triki , "Tigran A. Aivazian" , Ilya Dryomov , Alex Markuze , Jan Harkes , coda@cs.cmu.edu, Nicolas Pitre , Tyler Hicks , Amir Goldstein , Christoph Hellwig , John Paul Adrian Glaubitz , Yangtao Li , Mikulas Patocka , David Woodhouse , Richard Weinberger , Dave Kleikamp , Konstantin Komarov , Mark Fasheh , Joel Becker , Joseph Qi , Mike Marshall , Martin Brandenburg , Miklos Szeredi , Anders Larsen , Zhihao Cheng , Damien Le Moal , Naohiro Aota , Johannes Thumshirn , John Johansen , Paul Moore , James Morris , "Serge E. Hallyn" , Mimi Zohar , Roberto Sassu , Dmitry Kasatkin , Eric Snowberg , Fan Wu , Stephen Smalley , Ondrej Mosnacek , Casey Schaufler , Alex Deucher , =?utf-8?q?Christian_K=C3=B6nig?= , David Airlie , Simona Vetter , Sumit Semwal , Eric Dumazet , Kuniyuki Iwashima , Paolo Abeni , Willem de Bruijn , "David S. Miller" , Jakub Kicinski , Simon Horman , Oleg Nesterov , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , James Clark , "Darrick J. Wong" , Martin Schiller Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, nvdimm@lists.linux.dev, fsverity@lists.linux.dev, linux-mm@kvack.org, netfs@lists.linux.dev, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-nfs@vger.kernel.org, linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-nilfs@vger.kernel.org, v9fs@lists.linux.dev, linux-afs@lists.infradead.org, autofs@vger.kernel.org, ceph-devel@vger.kernel.org, codalist@coda.cs.cmu.edu, ecryptfs@vger.kernel.org, linux-mtd@lists.infradead.org, jfs-discussion@lists.sourceforge.net, ntfs3@lists.linux.dev, ocfs2-devel@lists.linux.dev, devel@lists.orangefs.org, linux-unionfs@vger.kernel.org, apparmor@lists.ubuntu.com, linux-security-module@vger.kernel.org, linux-integrity@vger.kernel.org, selinux@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org, netdev@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-fscrypt@vger.kernel.org, linux-xfs@vger.kernel.org, linux-hams@vger.kernel.org, linux-x25@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=9194; i=jlayton@kernel.org; h=from:subject:message-id; bh=UzUJVkE54+5worUh+6CVBOEGlTktcxnLHEhhDzvvwXo=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBpoG0QVGhyJJXjlb0Ncw4uXhIxu6EV5MOzZNNp3 gvBgg8J/O2JAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaaBtEAAKCRAADmhBGVaC Ff+iD/wO+msPOQaend9RGYlXSQlSmXaivymDEu0nuVAnKZyjZbYxWvPNY2bhJjvYsPkvh+MWd3f 8cMRNKE51rT2lYPI9r8YmbARRKckpiLX8YRuXQL26fwGK7qferIdfm/fxBQWMGuZb3B5xUExPwB MQXfy6cKzU9bynP1/NVvS8lAzFGnd/+I4SbsODF6dmbeehYcuIn1vQ4ggbv7iiWL8qNf2dtPAHh RLwCH9pZ3weunInHQbgOMowX2nZow+LkI0VFrVx2m4z54vRYdl6JIlxkG6PZXNEU1V/+BuxVPFV aC0WizkgjFeIdzzeMF81SoHOMOrleC1ZP+CLELNh/7VBCzX+5ZJjuT2m7fUr0y0X2al4NiTM6+E RnJJr8b019swsihaUbYJiTL0jiq5z5t5XzkZkJJRlqsPQNCqYUUrD+WsBEQ+r5eW/P+EdgZBDEd zwycEJ5ba9Sp3eF2fTEZ6d518Ri948FUEmDt0VrJestxGs6a9mmg25imFrXNOjfziIw6WENc6/U TJv7lBjDApR3WVdhISSn9oGRuOc0EaBDKdvQDB2DriRAla8NcD9AEgjaOp/S726BSztATlmMu3O G0Pc/ZYkAoZy4dExx5I3JPwmK3Xmwo0OiktEYvcT0znNkk34XPloOoANLg762thAyWbbxRUmte4 28SOSQyVJZbEdpg== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 X-Rspamd-Server: rspam09 X-Stat-Signature: rebo67cdjudokxoqe7dixb88cgrdgu6b X-Rspamd-Queue-Id: 8D4F0180011 X-Rspam-User: X-HE-Tag: 1772121992-198203 X-HE-Meta: U2FsdGVkX19IBjollBz32ijUfj237O30VgKTkILh5dvhY+POcTV4y9n/WfSEdwNi9rVwfggld9P4ZHHg0ERZgzfHAEFppYLqM/wHBiyv5/nr+PVqhproT5t/Rm9pDAdyZB8uXFhPKoBU4drQ5Ma1zKmpZ/GNXa4Io8RH9k1R6o51u16JxJ+Bq2UCfFbRxOk39pAOA7Y4GrRreqVDRSPZ2Azuk4kr770+SiA+Vv/CVPfuQcLqciOGmN61rMW6hm9U1Tpwhf2weh3KNXUHQCwCpKuogx30nUddRTp6zUTw8pttV9NCwiCLuqFYQODywjZ/PIOwo/X8bU12YMM8tW6P2oAsA+bqafO1BsIFgzUr1rxJA9r9pg9oQcvwQdsVhSkHzQr7b4RjZN9P3uqXVk5CueabQ3KUVPNCUCk9ZU0X1GYgv95lMSb/Xfv2FpANCTtrKtAz2ckrirVl5VtnUY0NFntrgONMoS6C/mqydT1sguZ0JothKfzYrwTr4BcJYk3mD73oXBAWfFykd6WXfnFBJFfuKFSYs3U1o214zGNfaxZfUeMmxGqWWDEEZohjA3lRRNRrTsPtaX0xLTbvJBigNgmgaX6m9Awb43KOD5bg940wppbGAxKfSr/kbK4hFmFcBN+dDP+DjULvBpb7XECehKUXbY4SJ7SIsoIQMeMVKqgayLU+BTzQBoYio+dFPdP2Y22UHkLPkPH6P2j0dUsaAoCVMyW5meRTriJygxRW6sU7xSGtABCh4LHsqSkwzPB2eAvAaWWxt7ZVAG6u0sda/miPHrPyXEMYIFhoZDtpkollBQpZ7ZDlI7dJXmQV6v6fL1fJG/IJ3/CJYvQIiaQsiUp3/wmDlWDSx3nURzaP13kvgfWI7tfQvFXP1uDsOc7iS/neh05blfq0Bp5F6sgxkfRDyPoox29HZtpIj0hkYN43PptitOiN7r9djQbWZrf9V1ocuz8HZ5I/90C+VUH qFLZdc+O wBRBWfE60CHn2Au+uRTmxIxxOZdT5Z9ISenkgwhCaIFdfjZqbUeK80WwxjFsOw4T3W8ZiOZjF6vZZOMwjNDkyPC2PoGlKbsL9pUJSNrfJhFF5xDrIVYscaoTAOJ33KDn8RO/GPlF62VU/Dgwrx3YxoidlI3OkditN+IObJv9aHdJuKwq1BYRRyElkqPA5iWdfU9/FrYDk9PXhA5BntgVcf3XxdBZ872V8bOXM+hnfdow1Po7lVAK2ebLsJr2l44Dd1zfUSpX5fVxdm7Lsu+/leDvtiyJYSs9cJO5bWMqSZ+JzhRYAil3PQonskdSABObr3NrDyk26c8UOjy+E7FkS7plea/y5V53YUQTdJ+s/j+sT3d58ZZdazZChpsqlaBIpuRzAQXbTIx6eriNnhHRTMN6WA6SRcQsB8TjOdlHhAC31OBLo5Usjhr9y15uwfWY8yLxC0KjkaNav95Wle8JlhxhNKW1SF0U6DY6oMHUYLi3VD9XHCejeIWpZwvXiddO7OBOFURvquZlS0Vh3uhX4cI1ChpGQgf/p6cEqlugnt8eADpvZ5yVfpzpZgWHQEFkKLZZl3rKxAt2hncjHwV2APsUOeib7EFo2jejgwxk3RCISVheOXnYXZRJWp6Wn5dgLvj5pN4AfzRCzWV8ohS/3KmUKYI10dqbz9za0vZqQBs9exMriniZ2ieBZaQ6P9RyUlXxlfKc9yrYEEU9ixVACEb9YpwS0RjAChanr3qyMWdsu3p/Z8zAbLMJX9agmC78Nnt3ARIuJPY0TvSt1mZH8vXXTzObQ4grvl5iUk4rVlZgtWKSKEgmgbprRdVxD8CZXAOFvS/Mq4IM+Y6ZgU2JVUkgZKNNGvBQiPSj/xFJB6lkMROClWzwxKCMQxNCI3U+tlvjD2M6l7+c5uIGPySS36dGsHo8KKnrksNjR1uCGaY4JdB6/uFmcKjptOv29eEOocjJb+eow0D9gZzJgckubgWI5VeFT z43W1klx Dw2SNXJWlYcxwFFmu0RnAOQ/ZDuyrUeA/o2duqhD6OxC1Hma6MhIPjKbpXYYSdwhKrT3SSUH7SMniDkuoMDdBKjL+1tBv7XjuMJcuTuhQbZ1aP3lqfreFKabvdWpjmkuT8nbus/Ez8p2/QFLbahOzWozBeG/9+QxR84B53vSsbLuDxcIAOo7VAQrik7HExz0zixfUuvi+c7z93UkGvX5zCNdITkXjxyP+mX+XBlUMXDnTQMM6xDsH0gOA3crafj8jHALgrjS57vKxBTT3T7IEsHK3l6iGdMwYx6IKZdQvAmCYjX5xB/ThteQo6JQXvi/yEzp59HsGMUHZSnPqn49VStKvZY+qGQaBycslyq1VXZ2u1yGAhfrycDAiMdk8scKVOfoD9jOF8Jv024q90bBmwf8GuAkOmrtEJ65URN+YJE1Yfd5DT1KrbPEC9RNOUrLtwIQgSw1JvLcB225vmI7BL1YAoz/Nd2dLbdtH5pN+AR/3cxstCxRIEigTdUWzbBPpjwBsTWPk0b04OGJUCyvAepRquih95c5wM3vmr2fmbYIMyqyJFJeZnZWD/3ZylaA2oMKfJoSc56jbBWlrpgLk8JC4cqRaFcNtDi+bRFbjEXz+gA7EkPCSeiZbzCW1uUq/qbzqL0Ixa9IrDsABoelmT4hNJVTP6PfVaTV8HO6QxI33CjO7w5at3flchRNu7Nk/3eMgnRoDQv+VbW+0kIR+Uo9u0Faap7PTHAf74q1osqVW+HDHaEomCgpBS92SrG3fQaMDN1GvuzV5ri7uuPihjX6bDPohysnCmWA+KAeIo4kKdWJklsic+sp1aIOIPTBr6gvvZ/aDKsahEMTtTlWGbtLcP8ncGeYjxtIKt0VPbDu0OOz5bFfwD13xASYTGlWlD2Kca/3WsNbrNSJbCkfnCUoVvKPJ2LHQZ0ezp7oYmJRYteDizjssxHSHRK/RT+rviJgVMG+THqzV5hhI178PLOjRGgm8 FcGJ5ZAY YqhzVw3XZ8E3U3+F2QebTzQv/YDVIVeJD8MHnh0k8u+/ZX9VEnoPNMbhlmpZPIQXxwm54bFTUA4FQDkbLn1VHDmLNl2qpLsszlqRpZWEa+q5nGVByoXBTOOWHBfuPKMWvsm8XU7dcMzDmbhX6vWuFsPGjlfRZOVK/x0PE4WmHtvxa8bJD+3rmidY8teh2fiiStlhcT7l5ugYjTxOR46sRWsRl8kpJrmTGPowVNqaeALsYbuy244ENb25pINw3xpdqpJrZn2KF/Fgi9fmYe7gLR+otLsscNotVj2KCduPRs7xjKHe4GEq6uhvHJVpTNxul2hK5dcOtdbcJzRcj60gVNvvbIOVtVoiYq75RMP89rfuat73cfEXVX2e7aNxKuKZ/lW4+xT4CM9ACp4N1B/BJUw3v3g/HPL54qtPjELRG+fL84K5Ygvf1HrSQJJGk3ESpwwHqERQuMG2h2P/vI1/cNEp3G9lqNLVRMiBCAKFj7Nqfg/lP5J5pzSvXXFLwpAbJdUP3Jeba2gIApiEKf5UBvrU/4hwJ/2RhlK32k1WOFWAHos4eLxJmIoUi+KY6gdrj4gIVIa8sCeZWS8erZtC4UCarmNOuecZbcewKKKfE3WRYlwSQ/2fP8TJe/jRP/dqFA2219zhncx9Jtts9YtNMyIAmFjSx3nRkFN+X9rblJCoCVRKVoxJlicUjC6vsrtJRopwTijUJlcJWIOnWOcl0qW4t+usic2+B1WxGs2AEYGLsgK4pELo8K93iGYQFjcrtcMktMHKYML0IsPg7iGYjm8NUwr1MrXn8PiNRLnM3Gc4M5cIn7EOKd7PPXo0VPdkPvDfVsIhT4WmqjBZC2wCVXxYdafwwkG+BnYbK19OiPjYudArbOQNaUqi5hvHrWM1gl/Jj6rvIAJfI9k6IkvcNJ1tZNLOnLwVc9a7s83I8PyI2lf6TxucO2BXFj+y57jU2KAjwn2B6wzcH/oyQdEbX9HG6MlGm 7ovLGrsZ AKb5z+Xs3+YTp+O3+q5pD9w4mHU0jvvUDTDkjD0m2T89J6gZjhi2rxNEdGiXXY3GRFz9jMR48vb1d8TrvzHtlel9Ajmhni5T9NQP/8FgAZl3XazMfWJ4rOl6AQYsJG3Z/gweCBwqjNXY/vaXeE2EEENy1XLbXDfkccOSaNAeGhQq3iNq+SgK0k6Qq5L+ILNwuC41iEEoBsZe8AeT4NA/CLiLjb/ZYxmWNVuRBh2ZvNQGrxfjZ8luUs+2o7Q7dha5FD4ie2wzE0J+DG38Me6mo0gk4KMhyu5m9oxfXocV8lPWR90Lo1x82NTVZGirbKmMXrVTHpcAb+IMYHWpJPLzt5KmByT29KTb4= Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Update format strings and local variable types in ufs for the i_ino type change from unsigned long to u64. Signed-off-by: Jeff Layton --- fs/ufs/balloc.c | 6 +++--- fs/ufs/dir.c | 10 +++++----- fs/ufs/ialloc.c | 6 +++--- fs/ufs/inode.c | 18 +++++++++--------- fs/ufs/ufs_fs.h | 6 +++--- fs/ufs/util.c | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/fs/ufs/balloc.c b/fs/ufs/balloc.c index 194ed3ab945e3eae94db085ee8d37eb1a4439470..628edfde3a9fd73852930094c19ae6944858f2c4 100644 --- a/fs/ufs/balloc.c +++ b/fs/ufs/balloc.c @@ -245,7 +245,7 @@ static void ufs_change_blocknr(struct inode *inode, sector_t beg, sector_t end, i; struct buffer_head *head, *bh; - UFSD("ENTER, ino %lu, count %u, oldb %llu, newb %llu\n", + UFSD("ENTER, ino %llu, count %u, oldb %llu, newb %llu\n", inode->i_ino, count, (unsigned long long)oldb, (unsigned long long)newb); @@ -340,7 +340,7 @@ u64 ufs_new_fragments(struct inode *inode, void *p, u64 fragment, unsigned cgno, oldcount, newcount; u64 tmp, request, result; - UFSD("ENTER, ino %lu, fragment %llu, goal %llu, count %u\n", + UFSD("ENTER, ino %llu, fragment %llu, goal %llu, count %u\n", inode->i_ino, (unsigned long long)fragment, (unsigned long long)goal, count); @@ -583,7 +583,7 @@ static u64 ufs_alloc_fragments(struct inode *inode, unsigned cgno, unsigned oldcg, i, j, k, allocsize; u64 result; - UFSD("ENTER, ino %lu, cgno %u, goal %llu, count %u\n", + UFSD("ENTER, ino %llu, cgno %u, goal %llu, count %u\n", inode->i_ino, cgno, (unsigned long long)goal, count); sb = inode->i_sb; diff --git a/fs/ufs/dir.c b/fs/ufs/dir.c index 43f1578ab8666a9611d4a77f5aababfce812fbe4..f10a50f7e78b8020fd216eff19c147b20bd332c1 100644 --- a/fs/ufs/dir.c +++ b/fs/ufs/dir.c @@ -150,7 +150,7 @@ static bool ufs_check_folio(struct folio *folio, char *kaddr) Ebadsize: ufs_error(sb, __func__, - "size of directory #%lu is not a multiple of chunk size", + "size of directory #%llu is not a multiple of chunk size", dir->i_ino ); goto fail; @@ -169,7 +169,7 @@ static bool ufs_check_folio(struct folio *folio, char *kaddr) Einumber: error = "inode out of bounds"; bad_entry: - ufs_error(sb, __func__, "bad entry in directory #%lu: %s - " + ufs_error(sb, __func__, "bad entry in directory #%llu: %s - " "offset=%llu, rec_len=%d, name_len=%d", dir->i_ino, error, folio_pos(folio) + offs, rec_len, ufs_get_de_namlen(sb, p)); @@ -177,7 +177,7 @@ static bool ufs_check_folio(struct folio *folio, char *kaddr) Eend: p = (struct ufs_dir_entry *)(kaddr + offs); ufs_error(sb, __func__, - "entry in directory #%lu spans the page boundary" + "entry in directory #%llu spans the page boundary" "offset=%llu", dir->i_ino, folio_pos(folio) + offs); fail: @@ -258,7 +258,7 @@ struct ufs_dir_entry *ufs_find_entry(struct inode *dir, const struct qstr *qstr, struct ufs_inode_info *ui = UFS_I(dir); struct ufs_dir_entry *de; - UFSD("ENTER, dir_ino %lu, name %s, namlen %u\n", dir->i_ino, name, namelen); + UFSD("ENTER, dir_ino %llu, name %s, namlen %u\n", dir->i_ino, name, namelen); if (npages == 0 || namelen > UFS_MAXNAMLEN) goto out; @@ -434,7 +434,7 @@ ufs_readdir(struct file *file, struct dir_context *ctx) if (IS_ERR(kaddr)) { ufs_error(sb, __func__, - "bad page in #%lu", + "bad page in #%llu", inode->i_ino); ctx->pos += PAGE_SIZE - offset; return PTR_ERR(kaddr); diff --git a/fs/ufs/ialloc.c b/fs/ufs/ialloc.c index 73531827ecee12b3dff09aef0acc0e374b00fb29..8e51f4630d186ae49aa987ca46df20960f300614 100644 --- a/fs/ufs/ialloc.c +++ b/fs/ufs/ialloc.c @@ -63,7 +63,7 @@ void ufs_free_inode (struct inode * inode) int is_directory; unsigned ino, cg, bit; - UFSD("ENTER, ino %lu\n", inode->i_ino); + UFSD("ENTER, ino %llu\n", inode->i_ino); sb = inode->i_sb; uspi = UFS_SB(sb)->s_uspi; @@ -317,7 +317,7 @@ struct inode *ufs_new_inode(struct inode *dir, umode_t mode) bh = sb_bread(sb, uspi->s_sbbase + ufs_inotofsba(inode->i_ino)); if (!bh) { ufs_warning(sb, "ufs_read_inode", - "unable to read inode %lu\n", + "unable to read inode %llu\n", inode->i_ino); err = -EIO; goto fail_remove_inode; @@ -336,7 +336,7 @@ struct inode *ufs_new_inode(struct inode *dir, umode_t mode) } mutex_unlock(&sbi->s_lock); - UFSD("allocating inode %lu\n", inode->i_ino); + UFSD("allocating inode %llu\n", inode->i_ino); UFSD("EXIT\n"); return inode; diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c index e2b0a35de2a7000f46a298114c1dcaffa17c43dc..2a8728c879796403166f713d1b4ee1b05fe1ffed 100644 --- a/fs/ufs/inode.c +++ b/fs/ufs/inode.c @@ -400,7 +400,7 @@ static int ufs_getfrag_block(struct inode *inode, sector_t fragment, struct buff mutex_lock(&UFS_I(inode)->truncate_mutex); - UFSD("ENTER, ino %lu, fragment %llu\n", inode->i_ino, (unsigned long long)fragment); + UFSD("ENTER, ino %llu, fragment %llu\n", inode->i_ino, (unsigned long long)fragment); if (unlikely(!depth)) { ufs_warning(sb, "ufs_get_block", "block > big"); err = -EIO; @@ -595,7 +595,7 @@ static int ufs2_read_inode(struct inode *inode, struct ufs2_inode *ufs2_inode) struct super_block *sb = inode->i_sb; umode_t mode; - UFSD("Reading ufs2 inode, ino %lu\n", inode->i_ino); + UFSD("Reading ufs2 inode, ino %llu\n", inode->i_ino); /* * Copy data to the in-core inode. */ @@ -662,7 +662,7 @@ struct inode *ufs_iget(struct super_block *sb, unsigned long ino) bh = sb_bread(sb, uspi->s_sbbase + ufs_inotofsba(inode->i_ino)); if (!bh) { - ufs_warning(sb, "ufs_read_inode", "unable to read inode %lu\n", + ufs_warning(sb, "ufs_read_inode", "unable to read inode %llu\n", inode->i_ino); goto bad_inode; } @@ -793,17 +793,17 @@ static int ufs_update_inode(struct inode * inode, int do_sync) struct ufs_sb_private_info *uspi = UFS_SB(sb)->s_uspi; struct buffer_head * bh; - UFSD("ENTER, ino %lu\n", inode->i_ino); + UFSD("ENTER, ino %llu\n", inode->i_ino); if (inode->i_ino < UFS_ROOTINO || inode->i_ino > (uspi->s_ncg * uspi->s_ipg)) { - ufs_warning (sb, "ufs_read_inode", "bad inode number (%lu)\n", inode->i_ino); + ufs_warning (sb, "ufs_read_inode", "bad inode number (%llu)\n", inode->i_ino); return -1; } bh = sb_bread(sb, ufs_inotofsba(inode->i_ino)); if (!bh) { - ufs_warning (sb, "ufs_read_inode", "unable to read inode %lu\n", inode->i_ino); + ufs_warning (sb, "ufs_read_inode", "unable to read inode %llu\n", inode->i_ino); return -1; } if (uspi->fs_magic == UFS2_MAGIC) { @@ -891,7 +891,7 @@ static void ufs_trunc_direct(struct inode *inode) unsigned int old_tail, new_tail; struct to_free ctx = {.inode = inode}; - UFSD("ENTER: ino %lu\n", inode->i_ino); + UFSD("ENTER: ino %llu\n", inode->i_ino); new_frags = DIRECT_FRAGMENT; // new_frags = first fragment past the new EOF @@ -956,7 +956,7 @@ static void ufs_trunc_direct(struct inode *inode) } } done: - UFSD("EXIT: ino %lu\n", inode->i_ino); + UFSD("EXIT: ino %llu\n", inode->i_ino); } static void free_full_branch(struct inode *inode, u64 ind_block, int depth) @@ -1169,7 +1169,7 @@ static int ufs_truncate(struct inode *inode, loff_t size) { int err = 0; - UFSD("ENTER: ino %lu, i_size: %llu, old_i_size: %llu\n", + UFSD("ENTER: ino %llu, i_size: %llu, old_i_size: %llu\n", inode->i_ino, (unsigned long long)size, (unsigned long long)i_size_read(inode)); diff --git a/fs/ufs/ufs_fs.h b/fs/ufs/ufs_fs.h index 0905f9a16b9150b656bd6d8966c0f8cc220b439d..b8dc354ae90f4a0839303f89c87bd2940db62b99 100644 --- a/fs/ufs/ufs_fs.h +++ b/fs/ufs/ufs_fs.h @@ -226,10 +226,10 @@ typedef __u16 __bitwise __fs16; * inode number to cylinder group number. * inode number to file system block address. */ -#define ufs_inotocg(x) ((x) / uspi->s_ipg) -#define ufs_inotocgoff(x) ((x) % uspi->s_ipg) +#define ufs_inotocg(x) ((unsigned int)(x) / uspi->s_ipg) +#define ufs_inotocgoff(x) ((unsigned int)(x) % uspi->s_ipg) #define ufs_inotofsba(x) (((u64)ufs_cgimin(ufs_inotocg(x))) + ufs_inotocgoff(x) / uspi->s_inopf) -#define ufs_inotofsbo(x) ((x) % uspi->s_inopf) +#define ufs_inotofsbo(x) ((unsigned int)(x) % uspi->s_inopf) /* * Compute the cylinder and rotational position of a cyl block addr. diff --git a/fs/ufs/util.c b/fs/ufs/util.c index 034b1d82c355ca49ec917e98dcfcc6d80e6eb00b..dff6f74618def7bd5687bd7427f3001a78b708b8 100644 --- a/fs/ufs/util.c +++ b/fs/ufs/util.c @@ -203,7 +203,7 @@ struct folio *ufs_get_locked_folio(struct address_space *mapping, folio = read_mapping_folio(mapping, index, NULL); if (IS_ERR(folio)) { - printk(KERN_ERR "ufs_change_blocknr: read_mapping_folio error: ino %lu, index: %lu\n", + printk(KERN_ERR "ufs_change_blocknr: read_mapping_folio error: ino %llu, index: %lu\n", mapping->host->i_ino, index); return folio; } -- 2.53.0