summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-10-28 06:15:26 -0600
committerJens Axboe <jaxboe@fusionio.com>2010-10-28 06:15:26 -0600
commit5ad21a337420e82bffb7836ab34027dd7ad624b8 (patch)
tree64fea23f93077564abc0678262721b9d27b3d8d8 /drivers/block
parent2027ae1fa914640c287171035cb607a03ad36e95 (diff)
downloadlinux-5ad21a337420e82bffb7836ab34027dd7ad624b8.tar.gz
linux-5ad21a337420e82bffb7836ab34027dd7ad624b8.tar.bz2
linux-5ad21a337420e82bffb7836ab34027dd7ad624b8.zip
aoe: don't use flush_scheduled_work()
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> Cc: "Ed L. Cashin" <ecashin@coraid.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/aoe/aoedev.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/block/aoe/aoedev.c b/drivers/block/aoe/aoedev.c
index 0849280bfc1c..6b5110a47458 100644
--- a/drivers/block/aoe/aoedev.c
+++ b/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, size_t cnt)
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;