On Mon 02-03-26 15:23:58, Jeff Layton wrote:
Convert proc i_ino format strings to use the PRIino format macro in preparation for the widening of i_ino via kino_t.
Update local variables and function parameters that hold i_ino values from unsigned long to kino_t.
Signed-off-by: Jeff Layton jlayton@kernel.org
Looks good. Feel free to add:
Reviewed-by: Jan Kara jack@suse.cz
Honza
fs/proc/fd.c | 2 +- fs/proc/task_mmu.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/proc/fd.c b/fs/proc/fd.c index 9eeccff49b2abf57d766ce17fe47070c379ed2c8..936d0258d688be5fdc384ee5c4dfbb8fa0d19dff 100644 --- a/fs/proc/fd.c +++ b/fs/proc/fd.c @@ -54,7 +54,7 @@ static int seq_show(struct seq_file *m, void *v) if (ret) return ret;
- seq_printf(m, "pos:\t%lli\nflags:\t0%o\nmnt_id:\t%i\nino:\t%lu\n",
- seq_printf(m, "pos:\t%lli\nflags:\t0%o\nmnt_id:\t%i\nino:\t%" PRIino "u\n", (long long)file->f_pos, f_flags, real_mount(file->f_path.mnt)->mnt_id, file_inode(file)->i_ino);
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index e091931d7ca19d71f31699913d177eec0821ca7b..702b0f0433f91077cd0d0af4a07e9d67d9fa9a45 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -442,7 +442,7 @@ static void get_vma_name(struct vm_area_struct *vma, static void show_vma_header_prefix(struct seq_file *m, unsigned long start, unsigned long end, vm_flags_t flags, unsigned long long pgoff,
dev_t dev, unsigned long ino)
dev_t dev, kino_t ino){ seq_setwidth(m, 25 + sizeof(void *) * 6 - 1); seq_put_hex_ll(m, NULL, start, 8); @@ -465,7 +465,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma) const struct path *path; const char *name_fmt, *name; vm_flags_t flags = vma->vm_flags;
- unsigned long ino = 0;
- kino_t ino = 0; unsigned long long pgoff = 0; unsigned long start, end; dev_t dev = 0;
-- 2.53.0