aoe: don't use flush_scheduled_work() (5ad21a33) · Commits · 戴 / test

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>

drivers/block/aoe/aoedev.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -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;

Admin message