Commit cbaaf6ef authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'v4.8-rc2-bcache-fixes' of https://bitbucket.org/ewheelerinc/linux into for-linus 

Eric writes:

Please pull this bcache branch based on v4.8-rc2.  These fix one
deadlock, one use blkdev_put() use counter, and one dmesg output with a
better pr_err() description.
parents c9d8fa6d 90706094

drivers/md/bcache/super.c

+10 −4
Original line number Original line Diff line number Diff line
@@ -760,7 +760,8 @@ static int bcache_device_init(struct bcache_device *d, unsigned block_size, 
	if (!d->nr_stripes ||

	if (!d->nr_stripes ||

	    d->nr_stripes > INT_MAX ||

	    d->nr_stripes > INT_MAX ||

	    d->nr_stripes > SIZE_MAX / sizeof(atomic_t)) {

	    d->nr_stripes > SIZE_MAX / sizeof(atomic_t)) {

		pr_err("nr_stripes too large");

		pr_err("nr_stripes too large or invalid: %u (start sector beyond end of disk?)",

			(unsigned)d->nr_stripes);

		return -ENOMEM;

		return -ENOMEM;

	}

	}
@@ -1820,7 +1821,7 @@ static int cache_alloc(struct cache *ca) 
	free = roundup_pow_of_two(ca->sb.nbuckets) >> 10;

	free = roundup_pow_of_two(ca->sb.nbuckets) >> 10;





	if (!init_fifo(&ca->free[RESERVE_BTREE], 8, GFP_KERNEL) ||

	if (!init_fifo(&ca->free[RESERVE_BTREE], 8, GFP_KERNEL) ||

	    !init_fifo(&ca->free[RESERVE_PRIO], prio_buckets(ca), GFP_KERNEL) ||

	    !init_fifo_exact(&ca->free[RESERVE_PRIO], prio_buckets(ca), GFP_KERNEL) ||

	    !init_fifo(&ca->free[RESERVE_MOVINGGC], free, GFP_KERNEL) ||

	    !init_fifo(&ca->free[RESERVE_MOVINGGC], free, GFP_KERNEL) ||

	    !init_fifo(&ca->free[RESERVE_NONE], free, GFP_KERNEL) ||

	    !init_fifo(&ca->free[RESERVE_NONE], free, GFP_KERNEL) ||

	    !init_fifo(&ca->free_inc,	free << 2, GFP_KERNEL) ||

	    !init_fifo(&ca->free_inc,	free << 2, GFP_KERNEL) ||
@@ -1844,7 +1845,7 @@ static int register_cache(struct cache_sb *sb, struct page *sb_page, 
				struct block_device *bdev, struct cache *ca)

				struct block_device *bdev, struct cache *ca)

{

{

	char name[BDEVNAME_SIZE];

	char name[BDEVNAME_SIZE];

	const char *err = NULL;

	const char *err = NULL; /* must be set for any error case */

	int ret = 0;

	int ret = 0;





	memcpy(&ca->sb, sb, sizeof(struct cache_sb));

	memcpy(&ca->sb, sb, sizeof(struct cache_sb));
@@ -1861,8 +1862,13 @@ static int register_cache(struct cache_sb *sb, struct page *sb_page, 
		ca->discard = CACHE_DISCARD(&ca->sb);

		ca->discard = CACHE_DISCARD(&ca->sb);





	ret = cache_alloc(ca);

	ret = cache_alloc(ca);

	if (ret != 0)

	if (ret != 0) {

		if (ret == -ENOMEM)

			err = "cache_alloc(): -ENOMEM";

		else

			err = "cache_alloc(): unknown error";

		goto err;

		goto err;

	}





	if (kobject_add(&ca->kobj, &part_to_dev(bdev->bd_part)->kobj, "bcache")) {

	if (kobject_add(&ca->kobj, &part_to_dev(bdev->bd_part)->kobj, "bcache")) {

		err = "error calling kobject_add";

		err = "error calling kobject_add";