Subject: [folded-merged] fsnotify-do-not-share-events-between-notification-groups-fix.patch removed from -mm tree
To: hughd@xxxxxxxxxx,eparis@xxxxxxxxxxxxxx,hch@xxxxxx,jack@xxxxxxx,viro@xxxxxxxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Tue, 21 Jan 2014 15:27:32 -0800
The patch titled
Subject: fanotify: fix corruption preventing startup
has been removed from the -mm tree. Its filename was
fsnotify-do-not-share-events-between-notification-groups-fix.patch
This patch was dropped because it was folded into fsnotify-do-not-share-events-between-notification-groups.patch
------------------------------------------------------
From: Hugh Dickins <hughd@xxxxxxxxxx>
Subject: fanotify: fix corruption preventing startup
Two of my machines couldn't boot mmotm with fanotify enabled:
0x40000020 was being or'ed into a group's notification_waitq next
pointer, with sad results. It comes from an over-simplification in
fanotify_merge(): test_event isn't NULL when the loop finds no merge.
Signed-off-by: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxx>
Cc: Eric Paris <eparis@xxxxxxxxxxxxxx>
Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Reviewed-by: Jan Kara <jack@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/notify/fanotify/fanotify.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff -puN fs/notify/fanotify/fanotify.c~fsnotify-do-not-share-events-between-notification-groups-fix fs/notify/fanotify/fanotify.c
--- a/fs/notify/fanotify/fanotify.c~fsnotify-do-not-share-events-between-notification-groups-fix
+++ a/fs/notify/fanotify/fanotify.c
@@ -37,16 +37,19 @@ static bool should_merge(struct fsnotify
static struct fsnotify_event *fanotify_merge(struct list_head *list,
struct fsnotify_event *event)
{
- struct fsnotify_event *test_event = NULL;
+ struct fsnotify_event *test_event;
+ bool do_merge = false;
pr_debug("%s: list=%p event=%p\n", __func__, list, event);
list_for_each_entry_reverse(test_event, list, list) {
- if (should_merge(test_event, event))
+ if (should_merge(test_event, event)) {
+ do_merge = true;
break;
+ }
}
- if (!test_event)
+ if (!do_merge)
return NULL;
test_event->mask |= event->mask;
_
Patches currently in -mm which might be from hughd@xxxxxxxxxx are
fsnotify-do-not-share-events-between-notification-groups.patch
mm-call-mmu-notifiers-when-copying-a-hugetlb-page-range.patch
mm-rmap-recompute-pgoff-for-huge-page.patch
mm-rmap-factor-nonlinear-handling-out-of-try_to_unmap_file.patch
mm-rmap-factor-lock-function-out-of-rmap_walk_anon.patch
mm-rmap-make-rmap_walk-to-get-the-rmap_walk_control-argument.patch
mm-rmap-extend-rmap_walk_xxx-to-cope-with-different-cases.patch
mm-rmap-use-rmap_walk-in-try_to_unmap.patch
mm-rmap-use-rmap_walk-in-try_to_munlock.patch
mm-rmap-use-rmap_walk-in-page_referenced.patch
mm-rmap-use-rmap_walk-in-page_referenced-fix.patch
mm-rmap-use-rmap_walk-in-page_mkclean.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
