Commit 0151ef00 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull block fixes from Jens Axboe:
 "A small set of fixes for -rc2 - two fixes for BFQ, documentation and
  code, and a removal of an unused variable in nbd. Outside of that, a
  small collection of fixes from the usual crew on the nvme side"

* 'for-linus' of git://git.kernel.dk/linux-block:
  nvmet: don't report 0-bytes in serial number
  nvmet: preserve controller serial number between reboots
  nvmet: Move serial number from controller to subsystem
  nvmet: prefix version configfs file with attr
  nvme-pci: Fix an error handling path in 'nvme_probe()'
  nvme-pci: Remove nvme_setup_prps BUG_ON
  nvme-pci: add another device ID with stripe quirk
  nvmet-fc: fix byte swapping in nvmet_fc_ls_create_association
  nvme: fix byte swapping in the streams code
  nbd: kill unused ret in recv_work
  bfq: dispatch request to prevent queue stalling after the request completion
  bfq: fix typos in comments about B-WF2Q+ algorithm
parents bb236dbe 42de82a8

block/bfq-iosched.c

+3 −0
Original line number Diff line number Diff line
@@ -4299,6 +4299,9 @@ static void bfq_completed_request(struct bfq_queue *bfqq, struct bfq_data *bfqd) 
			bfq_bfqq_expire(bfqd, bfqq, false,

					BFQQE_NO_MORE_REQUESTS);

	}



	if (!bfqd->rq_in_driver)

		bfq_schedule_dispatch(bfqd);

}



static void bfq_put_rq_priv_body(struct bfq_queue *bfqq)

block/bfq-iosched.h

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ struct bfq_entity; 
struct bfq_service_tree {

	/* tree for active entities (i.e., those backlogged) */

	struct rb_root active;

	/* tree for idle entities (i.e., not backlogged, with V <= F_i)*/

	/* tree for idle entities (i.e., not backlogged, with V < F_i)*/

	struct rb_root idle;



	/* idle entity with minimum F_i */

block/bfq-wf2q.c

+1 −1
Original line number Diff line number Diff line
@@ -1297,7 +1297,7 @@ static void bfq_update_vtime(struct bfq_service_tree *st, u64 new_value) 
 *

 * This function searches the first schedulable entity, starting from the

 * root of the tree and going on the left every time on this side there is

 * a subtree with at least one eligible (start >= vtime) entity. The path on

 * a subtree with at least one eligible (start <= vtime) entity. The path on

 * the right is followed only if a) the left subtree contains no eligible

 * entities and b) no eligible entity has been found yet.

 */

drivers/block/nbd.c

+0 −2
Original line number Diff line number Diff line
@@ -626,7 +626,6 @@ static void recv_work(struct work_struct *work) 
	struct nbd_device *nbd = args->nbd;

	struct nbd_config *config = nbd->config;

	struct nbd_cmd *cmd;

	int ret = 0;



	while (1) {

		cmd = nbd_read_stat(nbd, args->index);
@@ -636,7 +635,6 @@ static void recv_work(struct work_struct *work) 
			mutex_lock(&nsock->tx_lock);

			nbd_mark_nsock_dead(nbd, nsock, 1);

			mutex_unlock(&nsock->tx_lock);

			ret = PTR_ERR(cmd);

			break;

		}

drivers/nvme/host/core.c

+1 −1
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ static int nvme_get_stream_params(struct nvme_ctrl *ctrl, 


	c.directive.opcode = nvme_admin_directive_recv;

	c.directive.nsid = cpu_to_le32(nsid);

	c.directive.numd = sizeof(*s);

	c.directive.numd = cpu_to_le32(sizeof(*s));

	c.directive.doper = NVME_DIR_RCV_ST_OP_PARAM;

	c.directive.dtype = NVME_DIR_STREAMS;

CRA Git | Maintained and supported by SUSTech CRA and CCSE