Unverified Commit 0b2600f8 authored by Jeff Layton's avatar Jeff Layton Committed by Christian Brauner
Browse files

treewide: change inode->i_ino from unsigned long to u64 



On 32-bit architectures, unsigned long is only 32 bits wide, which
causes 64-bit inode numbers to be silently truncated. Several
filesystems (NFS, XFS, BTRFS, etc.) can generate inode numbers that
exceed 32 bits, and this truncation can lead to inode number collisions
and other subtle bugs on 32-bit systems.

Change the type of inode->i_ino from unsigned long to u64 to ensure that
inode numbers are always represented as 64-bit values regardless of
architecture. Update all format specifiers treewide from %lu/%lx to
%llu/%llx to match the new type, along with corresponding local variable
types.

This is the bulk treewide conversion. Earlier patches in this series
handled trace events separately to allow trace field reordering for
better struct packing on 32-bit.

Signed-off-by: default avatarJeff Layton <jlayton@kernel.org>
Link: https://patch.msgid.link/20260304-iino-u64-v3-12-2257ad83d372@kernel.org


Acked-by: default avatarDamien Le Moal <dlemoal@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent d84c70c6

drivers/dma-buf/dma-buf.c

+1 −1
Original line number Diff line number Diff line
@@ -1708,7 +1708,7 @@ static int dma_buf_debug_show(struct seq_file *s, void *unused) 




		spin_lock(&buf_obj->name_lock);

		seq_printf(s, "%08zu\t%08x\t%08x\t%08ld\t%s\t%08lu\t%s\n",

		seq_printf(s, "%08zu\t%08x\t%08x\t%08ld\t%s\t%08llu\t%s\n",

				buf_obj->size,

				buf_obj->file->f_flags, buf_obj->file->f_mode,

				file_count(buf_obj->file),

drivers/gpu/drm/amd/amdgpu/amdgpu_object.c

+2 −2
Original line number Diff line number Diff line
@@ -1676,9 +1676,9 @@ u64 amdgpu_bo_print_info(int id, struct amdgpu_bo *bo, struct seq_file *m) 
	attachment = READ_ONCE(bo->tbo.base.import_attach);



	if (attachment)

		seq_printf(m, " imported from ino:%lu", file_inode(dma_buf->file)->i_ino);

		seq_printf(m, " imported from ino:%llu", file_inode(dma_buf->file)->i_ino);

	else if (dma_buf)

		seq_printf(m, " exported as ino:%lu", file_inode(dma_buf->file)->i_ino);

		seq_printf(m, " exported as ino:%llu", file_inode(dma_buf->file)->i_ino);



	amdgpu_bo_print_flag(m, bo, CPU_ACCESS_REQUIRED);

	amdgpu_bo_print_flag(m, bo, NO_CPU_ACCESS);

fs/9p/vfs_addr.c

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static void v9fs_begin_writeback(struct netfs_io_request *wreq) 


	fid = v9fs_fid_find_inode(wreq->inode, true, INVALID_UID, true);

	if (!fid) {

		WARN_ONCE(1, "folio expected an open fid inode->i_ino=%lx\n",

		WARN_ONCE(1, "folio expected an open fid inode->i_ino=%llx\n",

			  wreq->inode->i_ino);

		return;

	}
@@ -133,7 +133,7 @@ static int v9fs_init_request(struct netfs_io_request *rreq, struct file *file) 
	return 0;



no_fid:

	WARN_ONCE(1, "folio expected an open fid inode->i_ino=%lx\n",

	WARN_ONCE(1, "folio expected an open fid inode->i_ino=%llx\n",

		  rreq->inode->i_ino);

	return -EINVAL;

}

fs/9p/vfs_inode.c

+3 −3
Original line number Diff line number Diff line
@@ -1245,7 +1245,7 @@ static int 
v9fs_vfs_symlink(struct mnt_idmap *idmap, struct inode *dir,

		 struct dentry *dentry, const char *symname)

{

	p9_debug(P9_DEBUG_VFS, " %lu,%pd,%s\n",

	p9_debug(P9_DEBUG_VFS, " %llu,%pd,%s\n",

		 dir->i_ino, dentry, symname);



	return v9fs_vfs_mkspecial(dir, dentry, P9_DMSYMLINK, symname);
@@ -1269,7 +1269,7 @@ v9fs_vfs_link(struct dentry *old_dentry, struct inode *dir, 
	char name[1 + U32_MAX_DIGITS + 2]; /* sign + number + \n + \0 */

	struct p9_fid *oldfid;



	p9_debug(P9_DEBUG_VFS, " %lu,%pd,%pd\n",

	p9_debug(P9_DEBUG_VFS, " %llu,%pd,%pd\n",

		 dir->i_ino, dentry, old_dentry);



	oldfid = v9fs_fid_clone(old_dentry);
@@ -1305,7 +1305,7 @@ v9fs_vfs_mknod(struct mnt_idmap *idmap, struct inode *dir, 
	char name[2 + U32_MAX_DIGITS + 1 + U32_MAX_DIGITS + 1];

	u32 perm;



	p9_debug(P9_DEBUG_VFS, " %lu,%pd mode: %x MAJOR: %u MINOR: %u\n",

	p9_debug(P9_DEBUG_VFS, " %llu,%pd mode: %x MAJOR: %u MINOR: %u\n",

		 dir->i_ino, dentry, mode,

		 MAJOR(rdev), MINOR(rdev));

fs/9p/vfs_inode_dotl.c

+3 −3
Original line number Diff line number Diff line
@@ -691,7 +691,7 @@ v9fs_vfs_symlink_dotl(struct mnt_idmap *idmap, struct inode *dir, 
	struct p9_fid *fid = NULL;



	name = dentry->d_name.name;

	p9_debug(P9_DEBUG_VFS, "%lu,%s,%s\n", dir->i_ino, name, symname);

	p9_debug(P9_DEBUG_VFS, "%llu,%s,%s\n", dir->i_ino, name, symname);



	dfid = v9fs_parent_fid(dentry);

	if (IS_ERR(dfid)) {
@@ -734,7 +734,7 @@ v9fs_vfs_link_dotl(struct dentry *old_dentry, struct inode *dir, 
	struct p9_fid *dfid, *oldfid;

	struct v9fs_session_info *v9ses;



	p9_debug(P9_DEBUG_VFS, "dir ino: %lu, old_name: %pd, new_name: %pd\n",

	p9_debug(P9_DEBUG_VFS, "dir ino: %llu, old_name: %pd, new_name: %pd\n",

		 dir->i_ino, old_dentry, dentry);



	v9ses = v9fs_inode2v9ses(dir);
@@ -798,7 +798,7 @@ v9fs_vfs_mknod_dotl(struct mnt_idmap *idmap, struct inode *dir, 
	struct p9_qid qid;

	struct posix_acl *dacl = NULL, *pacl = NULL;



	p9_debug(P9_DEBUG_VFS, " %lu,%pd mode: %x MAJOR: %u MINOR: %u\n",

	p9_debug(P9_DEBUG_VFS, " %llu,%pd mode: %x MAJOR: %u MINOR: %u\n",

		 dir->i_ino, dentry, omode,

		 MAJOR(rdev), MINOR(rdev));