The patch titled
Subject: docs: update documentation about /proc/<pid>/fdinfo/<fd> fanotify output
has been removed from the -mm tree. Its filename was
docs-update-documentation-about-proc-pid-fdinfo-fd-fanotify-output.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Cyrill Gorcunov <gorcunov@xxxxxxxxxx>
Subject: docs: update documentation about /proc/<pid>/fdinfo/<fd> fanotify output
Signed-off-by: Cyrill Gorcunov <gorcunov@xxxxxxxxxx>
Cc: Pavel Emelyanov <xemul@xxxxxxxxxxxxx>
Cc: Oleg Nesterov <oleg@xxxxxxxxxx>
Cc: Andrey Vagin <avagin@xxxxxxxxxx>
Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Cc: James Bottomley <jbottomley@xxxxxxxxxxxxx>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@xxxxxxxxxxxxxxxxxx>
Cc: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Cc: Matthew Helsley <matt.helsley@xxxxxxxxx>
Cc: "J. Bruce Fields" <bfields@xxxxxxxxxxxx>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@xxxxxxxxxxxxxxxxxx>
Cc: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
Documentation/filesystems/proc.txt | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
diff -puN Documentation/filesystems/proc.txt~docs-update-documentation-about-proc-pid-fdinfo-fd-fanotify-output Documentation/filesystems/proc.txt
--- a/Documentation/filesystems/proc.txt~docs-update-documentation-about-proc-pid-fdinfo-fd-fanotify-output
+++ a/Documentation/filesystems/proc.txt
@@ -1698,21 +1698,27 @@ pair provide additional information part
If the kernel is built without exportfs support the file handle won't be
printed out.
- For fanotify files the format is
+ If there is no inotify mark attached yet the 'inotify' line will be omitted.
- pos: 0
- flags: 02
- fanotify ino:2 sdev:800013 mask:1 ignored_mask:40000000 fhandle-bytes:8 fhandle-type:1 f_handle:0200000000000000
-
- or
+ For fanotify files the format is
pos: 0
flags: 02
- fanotify mnt_id:13 mask:1 ignored_mask:40000000
+ 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
+
+ where fanotify 'flags' and 'event-flags' are values used in fanotify_init
+ call, 'mnt_id' is the mount point identifier, 'mflags' is the value of
+ flags associated with mark which are tracked separately from events
+ mask. 'ino', 'sdev' are target inode and device, 'mask' is the events
+ mask and 'ignored_mask' is the mask of events which are to be ignored.
+ All in hex format. Incorporation of 'mflags', 'mask' and 'ignored_mask'
+ does provide information about flags and mask used in fanotify_mark
+ call [see fsnotify manpage for details].
- where 'ino', 'sdev' are target inode and device, 'mnt_id' is the mount
- point identifier, 'mask' is the events mask used and 'ignored_mask' is
- the mask of events which are to be ignored. All in hex format.
+ While the first three lines are mandatory and always printed, the rest is
+ optional and may be omitted if no marks created yet.
------------------------------------------------------------------------------
_
Patches currently in -mm which might be from gorcunov@xxxxxxxxxx are
origin.patch
linux-next.patch
fs-notify-add-procfs-fdinfo-helper-v7-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
