Commit 6c4bcd81 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-5.17-2022-03-18' of git://git.kernel.dk/linux-block 

Pull block fixes from Jens Axboe:

 - Revert of a nvme target feature (Hannes)

 - Fix a memory leak with rq-qos (Ming)

* tag 'block-5.17-2022-03-18' of git://git.kernel.dk/linux-block:
  nvmet: revert "nvmet: make discovery NQN configurable"
  block: release rq qos structures for queue without disk
parents cced5148 f6189589

block/blk-core.c

+4 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#include "blk-mq-sched.h"

#include "blk-pm.h"

#include "blk-throttle.h"

#include "blk-rq-qos.h"



struct dentry *blk_debugfs_root;
@@ -314,6 +315,9 @@ void blk_cleanup_queue(struct request_queue *q) 
	 */

	blk_freeze_queue(q);



	/* cleanup rq qos structures for queue without disk */

	rq_qos_exit(q);



	blk_queue_flag_set(QUEUE_FLAG_DEAD, q);



	blk_sync_queue(q);

drivers/nvme/target/configfs.c

+0 −39
Original line number Diff line number Diff line
@@ -1233,44 +1233,6 @@ static ssize_t nvmet_subsys_attr_model_store(struct config_item *item, 
}

CONFIGFS_ATTR(nvmet_subsys_, attr_model);



static ssize_t nvmet_subsys_attr_discovery_nqn_show(struct config_item *item,

			char *page)

{

	return snprintf(page, PAGE_SIZE, "%s\n",

			nvmet_disc_subsys->subsysnqn);

}



static ssize_t nvmet_subsys_attr_discovery_nqn_store(struct config_item *item,

			const char *page, size_t count)

{

	struct nvmet_subsys *subsys = to_subsys(item);

	char *subsysnqn;

	int len;



	len = strcspn(page, "\n");

	if (!len)

		return -EINVAL;



	subsysnqn = kmemdup_nul(page, len, GFP_KERNEL);

	if (!subsysnqn)

		return -ENOMEM;



	/*

	 * The discovery NQN must be different from subsystem NQN.

	 */

	if (!strcmp(subsysnqn, subsys->subsysnqn)) {

		kfree(subsysnqn);

		return -EBUSY;

	}

	down_write(&nvmet_config_sem);

	kfree(nvmet_disc_subsys->subsysnqn);

	nvmet_disc_subsys->subsysnqn = subsysnqn;

	up_write(&nvmet_config_sem);



	return count;

}

CONFIGFS_ATTR(nvmet_subsys_, attr_discovery_nqn);



#ifdef CONFIG_BLK_DEV_INTEGRITY

static ssize_t nvmet_subsys_attr_pi_enable_show(struct config_item *item,

						char *page)
@@ -1300,7 +1262,6 @@ static struct configfs_attribute *nvmet_subsys_attrs[] = { 
	&nvmet_subsys_attr_attr_cntlid_min,

	&nvmet_subsys_attr_attr_cntlid_max,

	&nvmet_subsys_attr_attr_model,

	&nvmet_subsys_attr_attr_discovery_nqn,

#ifdef CONFIG_BLK_DEV_INTEGRITY

	&nvmet_subsys_attr_attr_pi_enable,

#endif

drivers/nvme/target/core.c

+1 −2
Original line number Diff line number Diff line
@@ -1493,8 +1493,7 @@ static struct nvmet_subsys *nvmet_find_get_subsys(struct nvmet_port *port, 
	if (!port)

		return NULL;



	if (!strcmp(NVME_DISC_SUBSYS_NAME, subsysnqn) ||

	    !strcmp(nvmet_disc_subsys->subsysnqn, subsysnqn)) {

	if (!strcmp(NVME_DISC_SUBSYS_NAME, subsysnqn)) {

		if (!kref_get_unless_zero(&nvmet_disc_subsys->ref))

			return NULL;

		return nvmet_disc_subsys;