>From 1be7a610013b47be1257d2b0296d872d6bed7416 Mon Sep 17 00:00:00 2001 From: Brian Rogers Date: Fri, 28 Aug 2009 04:46:51 -0700 Subject: [PATCH] inotify: Fix events with no pathname When an event has no pathname, there's no need to pad it with a null byte and therefore generate an inotify_event sized block of zeros. This fixes a regression introduced by commit 0db501bd0610ee0c0aca84d927f90bcccd09e2bd where my system wouldn't finish booting because some process was being confused by this. Signed-off-by: Brian Rogers --- fs/notify/inotify/inotify_user.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c index 0e781bc..d94ce8b 100644 --- a/fs/notify/inotify/inotify_user.c +++ b/fs/notify/inotify/inotify_user.c @@ -199,7 +199,10 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group, /* round up event->name_len so it is a multiple of event_size * plus an extra byte for the terminating '\0'. */ - name_len = roundup(event->name_len + 1, event_size); + if (event->name_len > 0) + name_len = roundup(event->name_len + 1, event_size); + else + name_len = 0; inotify_event.len = name_len; inotify_event.mask = inotify_mask_to_arg(event->mask); -- 1.6.3.3