Signed-off-by: Cyrill Gorcunov <gorcu...@openvz.org>
CC: Pavel Emelyanov <xe...@parallels.com>
CC: Oleg Nesterov <o...@redhat.com>
CC: Andrey Vagin <ava...@openvz.org>
CC: Al Viro <v...@zeniv.linux.org.uk>
CC: Alexey Dobriyan <adobri...@gmail.com>
CC: Andrew Morton <a...@linux-foundation.org>
CC: James Bottomley <jbottom...@parallels.com>
CC: "Aneesh Kumar K.V" <aneesh.ku...@linux.vnet.ibm.com>
CC: Alexey Dobriyan <adobri...@gmail.com>
CC: Matthew Helsley <matt.hels...@gmail.com>
CC: "J. Bruce Fields" <bfie...@fieldses.org>
CC: "Aneesh Kumar K.V" <aneesh.ku...@linux.vnet.ibm.com>
CC: Tvrtko Ursulin <tvrtko.ursu...@onelan.co.uk>
---
 Documentation/filesystems/proc.txt |   26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

Index: linux-2.6.git/Documentation/filesystems/proc.txt
===================================================================
--- linux-2.6.git.orig/Documentation/filesystems/proc.txt
+++ linux-2.6.git/Documentation/filesystems/proc.txt
@@ -1696,21 +1696,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.
 
 
 ------------------------------------------------------------------------------

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to