bcache: Fix a sysfs splat on shutdown
If we stopped a bcache device when we were already detaching (or something like that), bcache_device_unlink() would try to remove a symlink from sysfs that was already gone because the bcache dev kobject had already been removed from sysfs. So keep track of whether we've removed stuff from sysfs. Signed-off-by: Kent Overstreet <kmo@daterainc.com> Cc: linux-stable <stable@vger.kernel.org> # >= v3.10
This commit is contained in:
Родитель
54d12f2b4f
Коммит
c9502ea442
|
@ -434,6 +434,7 @@ struct bcache_device {
|
|||
|
||||
/* If nonzero, we're detaching/unregistering from cache set */
|
||||
atomic_t detaching;
|
||||
int flush_done;
|
||||
|
||||
uint64_t nr_stripes;
|
||||
unsigned stripe_size_bits;
|
||||
|
|
|
@ -706,6 +706,7 @@ static void bcache_device_detach(struct bcache_device *d)
|
|||
atomic_set(&d->detaching, 0);
|
||||
}
|
||||
|
||||
if (!d->flush_done)
|
||||
bcache_device_unlink(d);
|
||||
|
||||
d->c->devices[d->id] = NULL;
|
||||
|
@ -1055,6 +1056,14 @@ static void cached_dev_flush(struct closure *cl)
|
|||
struct cached_dev *dc = container_of(cl, struct cached_dev, disk.cl);
|
||||
struct bcache_device *d = &dc->disk;
|
||||
|
||||
mutex_lock(&bch_register_lock);
|
||||
d->flush_done = 1;
|
||||
|
||||
if (d->c)
|
||||
bcache_device_unlink(d);
|
||||
|
||||
mutex_unlock(&bch_register_lock);
|
||||
|
||||
bch_cache_accounting_destroy(&dc->accounting);
|
||||
kobject_del(&d->kobj);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче