[merged] jffs2-remove-wait-queue-after-schedule.patch removed from -mm tree

[merged] jffs2-remove-wait-queue-after-schedule.patch removed from -mm tree

[akpm]

Subject: [merged] jffs2-remove-wait-queue-after-schedule.patch removed from -mm tree
To: lizefan@huawei.com,artem.bityutskiy@linux.intel.com,computersforpeace@gmail.com,dwmw2@infradead.org,stable@vger.kernel.org,mm-commits@vger.kernel.org
From: akpm@linux-foundation.org
Date: Thu, 27 Feb 2014 12:24:08 -0800


The patch titled
     Subject: jffs2: remove wait queue after schedule()
has been removed from the -mm tree.  Its filename was
     jffs2-remove-wait-queue-after-schedule.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Li Zefan <lizefan@huawei.com>
Subject: jffs2: remove wait queue after schedule()

@wait is a local variable, so if we don't remove it from the wait queue
list, later wake_up() may end up accessing invalid memory.

This was spotted by eyes.

Signed-off-by: Li Zefan <lizefan@huawei.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Brian Norris <computersforpeace@gmail.com>
Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/jffs2/nodemgmt.c |    1 +
 1 file changed, 1 insertion(+)

diff -puN fs/jffs2/nodemgmt.c~jffs2-remove-wait-queue-after-schedule fs/jffs2/nodemgmt.c
--- a/fs/jffs2/nodemgmt.c~jffs2-remove-wait-queue-after-schedule
+++ a/fs/jffs2/nodemgmt.c
@@ -179,6 +179,7 @@ int jffs2_reserve_space(struct jffs2_sb_
 					spin_unlock(&c->erase_completion_lock);
 
 					schedule();
+					remove_wait_queue(&c->erase_wait, &wait);
 				} else
 					spin_unlock(&c->erase_completion_lock);
 			} else if (ret)
_

Patches currently in -mm which might be from lizefan@huawei.com are

linux-next.patch