Commit af22941a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.dk/linux-block 

Pull block layer fixes from Jens Axboe:
 "Just a set of small fixes that have either been queued up after the
  original pull for this merge window, or just missed the original pull
  request.

   - a few bcache fixes/changes from Eric and Kent

   - add WRITE_SAME to the command filter whitelist frm Mauricio

   - kill an unused struct member from Ritesh

   - partition IO alignment fix from Stefan

   - nvme sysfs printf fix from Stephen"

* 'for-linus' of git://git.kernel.dk/linux-block:
  block: check partition alignment
  nvme : Use correct scnprintf in cmb show
  block: allow WRITE_SAME commands with the SG_IO ioctl
  block: Remove unused member (busy) from struct blk_queue_tag
  bcache: partition support: add 16 minors per bcacheN device
  bcache: Make gc wakeup sane, remove set_task_state()
parents 9be962d5 633395b6

block/ioctl.c

+3 −0
Original line number Diff line number Diff line
@@ -45,6 +45,9 @@ static int blkpg_ioctl(struct block_device *bdev, struct blkpg_ioctl_arg __user 
				    || pstart < 0 || plength < 0 || partno > 65535)

					return -EINVAL;

			}

			/* check if partition is aligned to blocksize */

			if (p.start & (bdev_logical_block_size(bdev) - 1))

				return -EINVAL;



			mutex_lock(&bdev->bd_mutex);

block/scsi_ioctl.c

+3 −0
Original line number Diff line number Diff line
@@ -182,6 +182,9 @@ static void blk_set_cmd_filter_defaults(struct blk_cmd_filter *filter) 
	__set_bit(WRITE_16, filter->write_ok);

	__set_bit(WRITE_LONG, filter->write_ok);

	__set_bit(WRITE_LONG_2, filter->write_ok);

	__set_bit(WRITE_SAME, filter->write_ok);

	__set_bit(WRITE_SAME_16, filter->write_ok);

	__set_bit(WRITE_SAME_32, filter->write_ok);

	__set_bit(ERASE, filter->write_ok);

	__set_bit(GPCMD_MODE_SELECT_10, filter->write_ok);

	__set_bit(MODE_SELECT, filter->write_ok);

drivers/md/bcache/bcache.h

+2 −2
Original line number Diff line number Diff line
@@ -425,7 +425,7 @@ struct cache { 
	 * until a gc finishes - otherwise we could pointlessly burn a ton of

	 * cpu

	 */

	unsigned		invalidate_needs_gc:1;

	unsigned		invalidate_needs_gc;



	bool			discard; /* Get rid of? */
@@ -593,8 +593,8 @@ struct cache_set { 


	/* Counts how many sectors bio_insert has added to the cache */

	atomic_t		sectors_to_gc;

	wait_queue_head_t	gc_wait;



	wait_queue_head_t	moving_gc_wait;

	struct keybuf		moving_gc_keys;

	/* Number of moving GC bios in flight */

	struct semaphore	moving_in_flight;

drivers/md/bcache/btree.c

+20 −19
Original line number Diff line number Diff line
@@ -1757,32 +1757,34 @@ static void bch_btree_gc(struct cache_set *c) 
	bch_moving_gc(c);

}



static int bch_gc_thread(void *arg)

static bool gc_should_run(struct cache_set *c)

{

	struct cache_set *c = arg;

	struct cache *ca;

	unsigned i;



	while (1) {

again:

		bch_btree_gc(c);



		set_current_state(TASK_INTERRUPTIBLE);

		if (kthread_should_stop())

			break;

	for_each_cache(ca, c, i)

		if (ca->invalidate_needs_gc)

			return true;



		mutex_lock(&c->bucket_lock);

	if (atomic_read(&c->sectors_to_gc) < 0)

		return true;



		for_each_cache(ca, c, i)

			if (ca->invalidate_needs_gc) {

				mutex_unlock(&c->bucket_lock);

				set_current_state(TASK_RUNNING);

				goto again;

	return false;

}



		mutex_unlock(&c->bucket_lock);

static int bch_gc_thread(void *arg)

{

	struct cache_set *c = arg;



	while (1) {

		wait_event_interruptible(c->gc_wait,

			   kthread_should_stop() || gc_should_run(c));



		if (kthread_should_stop())

			break;



		schedule();

		set_gc_sectors(c);

		bch_btree_gc(c);

	}



	return 0;
@@ -1790,11 +1792,10 @@ again: 


int bch_gc_thread_start(struct cache_set *c)

{

	c->gc_thread = kthread_create(bch_gc_thread, c, "bcache_gc");

	c->gc_thread = kthread_run(bch_gc_thread, c, "bcache_gc");

	if (IS_ERR(c->gc_thread))

		return PTR_ERR(c->gc_thread);



	set_task_state(c->gc_thread, TASK_INTERRUPTIBLE);

	return 0;

}

drivers/md/bcache/btree.h

+1 −2
Original line number Diff line number Diff line
@@ -260,8 +260,7 @@ void bch_initial_mark_key(struct cache_set *, int, struct bkey *); 


static inline void wake_up_gc(struct cache_set *c)

{

	if (c->gc_thread)

		wake_up_process(c->gc_thread);

	wake_up(&c->gc_wait);

}



#define MAP_DONE	0

CRA Git | Maintained and supported by SUSTech CRA and CCSE