From 5ded961aa2678530dbde87438af6095f3a2a048c Mon Sep 17 00:00:00 2001 From: Kalesh Singh Date: Thu, 8 Jul 2021 16:54:58 +0000 Subject: [PATCH] Revert "FROMLIST: BACKPORT: procfs/dmabuf: Add inode number to /..." Revert submission 1578844 Reason for revert: Will be replaced by upstream version Reverted Changes: Ic9c551998:FROMLIST: BACKPORT: procfs/dmabuf: Add inode numbe... I41407760c:FROMLIST: procfs: Allow reading fdinfo with PTRACE... Bug: 159126739 Bug: 167141117 Signed-off-by: Kalesh Singh Change-Id: If02a6dc9a525193f286a138791de49085cd91972 --- Documentation/filesystems/proc.rst | 37 +++++------------------------- fs/proc/fd.c | 5 ++-- 2 files changed, 8 insertions(+), 34 deletions(-) diff --git a/Documentation/filesystems/proc.rst b/Documentation/filesystems/proc.rst index 1b506a51d148..05891a029f83 100644 --- a/Documentation/filesystems/proc.rst +++ b/Documentation/filesystems/proc.rst @@ -1906,20 +1906,18 @@ if precise results are needed. 3.8 /proc//fdinfo/ - Information about opened file --------------------------------------------------------------- This file provides information associated with an opened file. The regular -files have at least four fields -- 'pos', 'flags', 'mnt_id' and 'ino'. -The 'pos' represents the current offset of the opened file in decimal -form [see lseek(2) for details], 'flags' denotes the octal O_xxx mask the -file has been created with [see open(2) for details] and 'mnt_id' represents -mount ID of the file system containing the opened file [see 3.5 -/proc//mountinfo for details]. 'ino' represents the inode number of -the file. +files have at least three fields -- 'pos', 'flags' and 'mnt_id'. The 'pos' +represents the current offset of the opened file in decimal form [see lseek(2) +for details], 'flags' denotes the octal O_xxx mask the file has been +created with [see open(2) for details] and 'mnt_id' represents mount ID of +the file system containing the opened file [see 3.5 /proc//mountinfo +for details]. A typical output is:: pos: 0 flags: 0100002 mnt_id: 19 - ino: 63107 All locks associated with a file descriptor are shown in its fdinfo too:: @@ -1936,7 +1934,6 @@ Eventfd files pos: 0 flags: 04002 mnt_id: 9 - ino: 63107 eventfd-count: 5a where 'eventfd-count' is hex value of a counter. @@ -1949,7 +1946,6 @@ Signalfd files pos: 0 flags: 04002 mnt_id: 9 - ino: 63107 sigmask: 0000000000000200 where 'sigmask' is hex value of the signal mask associated @@ -1963,7 +1959,6 @@ Epoll files pos: 0 flags: 02 mnt_id: 9 - ino: 63107 tfd: 5 events: 1d data: ffffffffffffffff pos:0 ino:61af sdev:7 where 'tfd' is a target file descriptor number in decimal form, @@ -1980,8 +1975,6 @@ For inotify files the format is the following:: pos: 0 flags: 02000000 - mnt_id: 9 - ino: 63107 inotify wd:3 ino:9e7e sdev:800013 mask:800afce ignored_mask:0 fhandle-bytes:8 fhandle-type:1 f_handle:7e9e0000640d1b6d where 'wd' is a watch descriptor in decimal form, i.e. a target file @@ -2004,7 +1997,6 @@ For fanotify files the format is:: pos: 0 flags: 02 mnt_id: 9 - ino: 63107 fanotify flags:10 event-flags:0 fanotify mnt_id:12 mflags:40 mask:38 ignored_mask:40000003 fanotify ino:4f969 sdev:800013 mflags:0 mask:3b ignored_mask:40000000 fhandle-bytes:8 fhandle-type:1 f_handle:69f90400c275b5b4 @@ -2029,7 +2021,6 @@ Timerfd files pos: 0 flags: 02 mnt_id: 9 - ino: 63107 clockid: 0 ticks: 0 settime flags: 01 @@ -2044,22 +2035,6 @@ details]. 'it_value' is remaining time until the timer expiration. with TIMER_ABSTIME option which will be shown in 'settime flags', but 'it_value' still exhibits timer's remaining time. -DMA Buffer files -~~~~~~~~~~~~~~~~ - -:: - - pos: 0 - flags: 04002 - mnt_id: 9 - ino: 63107 - size: 32768 - count: 2 - exp_name: system-heap - -where 'size' is the size of the DMA buffer in bytes. 'count' is the file count of -the DMA buffer file. 'exp_name' is the name of the DMA buffer exporter. - 3.9 /proc//map_files - Information about memory mapped files --------------------------------------------------------------------- This directory contains symbolic links which represent memory mapped files diff --git a/fs/proc/fd.c b/fs/proc/fd.c index 6157913911f8..b0357e5d3950 100644 --- a/fs/proc/fd.c +++ b/fs/proc/fd.c @@ -54,10 +54,9 @@ 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\n", (long long)file->f_pos, f_flags, - real_mount(file->f_path.mnt)->mnt_id, - file_inode(file)->i_ino); + real_mount(file->f_path.mnt)->mnt_id); show_fd_locks(m, file, files); if (seq_has_overflowed(m))