From 94f610d306dd3f146c7c8473d604e7ce065ae08b Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 18 Nov 2012 19:19:00 +0000 Subject: [PATCH] --- yaml --- r: 335822 b: refs/heads/master c: 3587b1b097d70c2eb9fee95ea7995d13c05f66e5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/notify/fanotify/fanotify_user.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ae1c8cf7a0da..b433f007e27b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8d938105e432fe0e9f5163147e9c113190bd9d32 +refs/heads/master: 3587b1b097d70c2eb9fee95ea7995d13c05f66e5 diff --git a/trunk/fs/notify/fanotify/fanotify_user.c b/trunk/fs/notify/fanotify/fanotify_user.c index 721d692fa8d4..6fcaeb8c902e 100644 --- a/trunk/fs/notify/fanotify/fanotify_user.c +++ b/trunk/fs/notify/fanotify/fanotify_user.c @@ -258,7 +258,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group, if (ret) goto out_close_fd; - fd_install(fd, f); + if (fd != FAN_NOFD) + fd_install(fd, f); return fanotify_event_metadata.event_len; out_close_fd: