From 75c3e3bd6be2fb7c5ee8ffb92b8d5e7f1224088f Mon Sep 17 00:00:00 2001 From: Michael Kerrisk Date: Fri, 25 Apr 2014 11:24:04 +0200 Subject: [PATCH] fanotify.7: Move the text on event merging Place it near the discussion of the events bit mask. Signed-off-by: Michael Kerrisk --- man7/fanotify.7 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/man7/fanotify.7 b/man7/fanotify.7 index f21973dff..8f1950c0f 100644 --- a/man7/fanotify.7 +++ b/man7/fanotify.7 @@ -113,9 +113,6 @@ permission for a file access shall be granted. For these events, the recipient must write a response which decides whether access is granted or not. -Consecutive events for the same filesystem object and originating from the -same process may be merged into a single event, with the exception that two -permission events are never merged into one queue entry. Queue entries for notification events are removed when the event has been read. Queue entries for permission events are removed when the permission @@ -214,6 +211,11 @@ The bit mask in signals which events have occurred for a single filesystem object. Multiple bits may be set in this mask, if more than one event occurred for the monitored filesystem obect. +In particular, +consecutive events for the same filesystem object and originating from the +same process may be merged into a single event, with the exception that two +permission events are never merged into one queue entry. +.PP The bits that may appear in .I mask are as follows: