Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9502ea4 authored by Kent Overstreet's avatar Kent Overstreet
Browse files

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: default avatarKent Overstreet <kmo@daterainc.com>
Cc: linux-stable <stable@vger.kernel.org> # >= v3.10
parent 54d12f2b

drivers/md/bcache/bcache.h

+1 −0
Original line number Diff line number Diff line
@@ -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;

drivers/md/bcache/super.c

+10 −1
Original line number Diff line number Diff line
@@ -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);