Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivi...

[linux-2.6-block.git] / Documentation / filesystems / proc.txt

diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt
index 324328d1846421874a2e1cc071f6ec7499c0ee82..ddc531a74d04970810485e2cd5c2d4ba1cb74435 100644 (file)
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@ -1246,8 +1246,9 @@ second).  The meanings of the columns are as follows, from left to right:
 
 The "intr" line gives counts of interrupts  serviced since boot time, for each
 of the  possible system interrupts.   The first  column  is the  total of  all
-interrupts serviced; each  subsequent column is the  total for that particular
-interrupt.
+interrupts serviced  including  unnumbered  architecture specific  interrupts;
+each  subsequent column is the  total for that particular numbered interrupt.
+Unnumbered interrupts are not shown, only summed into the total.
 
 The "ctxt" line gives the total number of context switches across all CPUs.
 
@@ -1649,18 +1650,21 @@ pids, so one need to either stop or freeze processes being inspected
 if precise results are needed.
 
 
-3.7    /proc/<pid>/fdinfo/<fd> - Information about opened file
+3.8    /proc/<pid>/fdinfo/<fd> - Information about opened file
 ---------------------------------------------------------------
 This file provides information associated with an opened file. The regular
-files have at least two fields -- 'pos' and 'flags'. The 'pos' represents
-the current offset of the opened file in decimal form [see lseek(2) for
-details] and 'flags' denotes the octal O_xxx mask the file has been
-created with [see open(2) for details].
+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/<pid>/mountinfo
+for details].
 
 A typical output is
 
        pos:    0
        flags:  0100002
+       mnt_id: 19
 
 The files such as eventfd, fsnotify, signalfd, epoll among the regular pos/flags
 pair provide additional information particular to the objects they represent.
@@ -1669,6 +1673,7 @@ pair provide additional information particular to the objects they represent.
        ~~~~~~~~~~~~~
        pos:    0
        flags:  04002
+       mnt_id: 9
        eventfd-count:  5a
 
        where 'eventfd-count' is hex value of a counter.
@@ -1677,6 +1682,7 @@ pair provide additional information particular to the objects they represent.
        ~~~~~~~~~~~~~~
        pos:    0
        flags:  04002
+       mnt_id: 9
        sigmask:        0000000000000200
 
        where 'sigmask' is hex value of the signal mask associated
@@ -1686,6 +1692,7 @@ pair provide additional information particular to the objects they represent.
        ~~~~~~~~~~~
        pos:    0
        flags:  02
+       mnt_id: 9
        tfd:        5 events:       1d data: ffffffffffffffff
 
        where 'tfd' is a target file descriptor number in decimal form,
@@ -1719,6 +1726,7 @@ pair provide additional information particular to the objects they represent.
 
        pos:    0
        flags:  02
+       mnt_id: 9
        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