* [PATCH v2.6.36-rc7] aoe: don't use flush_scheduled_work()
@ 2010-10-15 11:36 Tejun Heo
0 siblings, 0 replies; only message in thread
From: Tejun Heo @ 2010-10-15 11:36 UTC (permalink / raw)
To: Ed L. Cashin, lkml, Andrew Morton
flush_scheduled_work() is deprecated and scheduled to be removed.
Directly cancel aoedev->work on free instead of depending on
flush_scheduled_works().
Signed-off-by: Tejun Heo <tj@kernel.org>
---
drivers/block/aoe/aoedev.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
Index: work/drivers/block/aoe/aoedev.c
===================================================================
--- work.orig/drivers/block/aoe/aoedev.c
+++ work/drivers/block/aoe/aoedev.c
@@ -102,6 +102,7 @@ aoedev_freedev(struct aoedev *d)
{
struct aoetgt **t, **e;
+ cancel_work_sync(&d->work);
if (d->gd) {
aoedisk_rm_sysfs(d);
del_gendisk(d->gd);
@@ -135,7 +136,6 @@ aoedev_flush(const char __user *str, siz
all = !strncmp(buf, "all", 3);
}
- flush_scheduled_work();
spin_lock_irqsave(&devlist_lock, flags);
dd = &devlist;
while ((d = *dd)) {
@@ -257,8 +257,6 @@ aoedev_exit(void)
struct aoedev *d;
ulong flags;
- flush_scheduled_work();
-
while ((d = devlist)) {
devlist = d->next;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-10-15 11:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-15 11:36 [PATCH v2.6.36-rc7] aoe: don't use flush_scheduled_work() Tejun Heo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).