From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DF95E6026A for ; Tue, 20 Feb 2024 09:32:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.137.202.133 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708421576; cv=none; b=ZLgRA/uTNMa7Pcccj0h+yGz0J6xspQ6surhP4LodXgxKplEisg4JmaS9FAnVst5b7qydATbqdJN9RChu+y40r+TEjVmmXF+crMw57P1rEen1TZSRWEqXhiwVg7gMvYuhaEnx6xD0poh4BUe5sG7+U3SMMzauQ07HXT4u5YvN1xc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708421576; c=relaxed/simple; bh=qOc8yK2XoYuN355qY3DKG83Gac8TnCY+o48npqTEeZk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=mTfDwb/YRMnorTnVN92K2kG2hqbQam3764BflxS0IkmRbvUyhfvqu0zUe0SPO4TZtyEFZIErSf9HVVjXpcWo7QRGKu7dVd6yzV9pJX+YGbEAEK9J6wGm3nSRglEY+K6BUE/+OL4/XbxD2TJgkJs7AT+DPuBGvAybRfIIoBrpNs0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de; spf=none smtp.mailfrom=bombadil.srs.infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=B+4JJHgA; arc=none smtp.client-ip=198.137.202.133 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=bombadil.srs.infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="B+4JJHgA" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=kb6QErPf8EM/+aQV/fGOSOnfYzS+RdK4iWwwPj6UkDg=; b=B+4JJHgAJnhbIRYvtI15WXg2ix KpXAHwYM6HnHxpEMl/yWloP8qVQkBZ8Lkri/0HldTagAql6+EUh3BxOYu6NqV6f+TPPg4GnffSSKL TFPbS8vvgKBoiim4MPhOCx2cLxGbqWuW+vpmYBxLz6xMcfF+mJ2a2Zn66su2XxkJ+Ir5YEdYWUgzJ rMhmqIIVtSuS7woNcjL7biRJgqzPzXIwfOMsfahH2lynIjMXWlyV8YiYiDgVCludAAIP1BEI1HANj PBmmVkzSv2Yelb+NKd+hDSvfHUTC4NbFWVb9bmPYaScczQLO5VhKJmScp307dsVLON/TkhJAdxQMq Zij0X5UA==; Received: from 2a02-8389-2341-5b80-39d3-4735-9a3c-88d8.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:39d3:4735:9a3c:88d8] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.97.1 #2 (Red Hat Linux)) id 1rcMUg-0000000E0lk-0Ox5; Tue, 20 Feb 2024 09:32:54 +0000 From: Christoph Hellwig To: Jens Axboe Cc: linux-block@vger.kernel.org, Damien Le Moal , Hannes Reinecke , Johannes Thumshirn Subject: [PATCH 4/5] null_blk: remove null_gendisk_register Date: Tue, 20 Feb 2024 10:32:47 +0100 Message-Id: <20240220093248.3290292-5-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240220093248.3290292-1-hch@lst.de> References: <20240220093248.3290292-1-hch@lst.de> Precedence: bulk X-Mailing-List: linux-block@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html null_gendisk_register isn't a very useful abstraction given that it doesn't even allocate the gendisk. Merge it into the only caller instead. Signed-off-by: Christoph Hellwig Reviewed-by: Damien Le Moal Reviewed-by: Hannes Reinecke Reviewed-by: Johannes Thumshirn Tested-by: Damien Le Moal --- drivers/block/null_blk/main.c | 41 ++++++++++++++--------------------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/drivers/block/null_blk/main.c b/drivers/block/null_blk/main.c index 03c3917a56fa28..0c8d5042321302 100644 --- a/drivers/block/null_blk/main.c +++ b/drivers/block/null_blk/main.c @@ -1735,30 +1735,6 @@ static int setup_queues(struct nullb *nullb) return 0; } -static int null_gendisk_register(struct nullb *nullb) -{ - sector_t size = ((sector_t)nullb->dev->size * SZ_1M) >> SECTOR_SHIFT; - struct gendisk *disk = nullb->disk; - - set_capacity(disk, size); - - disk->major = null_major; - disk->first_minor = nullb->index; - disk->minors = 1; - disk->fops = &null_ops; - disk->private_data = nullb; - strscpy_pad(disk->disk_name, nullb->disk_name, DISK_NAME_LEN); - - if (nullb->dev->zoned) { - int ret = null_register_zoned_dev(nullb); - - if (ret) - return ret; - } - - return add_disk(disk); -} - static int null_init_tag_set(struct blk_mq_tag_set *set, int poll_queues) { set->ops = &null_mq_ops; @@ -1972,7 +1948,22 @@ static int null_add_dev(struct nullb_device *dev) sprintf(nullb->disk_name, "nullb%d", nullb->index); } - rv = null_gendisk_register(nullb); + set_capacity(nullb->disk, + ((sector_t)nullb->dev->size * SZ_1M) >> SECTOR_SHIFT); + nullb->disk->major = null_major; + nullb->disk->first_minor = nullb->index; + nullb->disk->minors = 1; + nullb->disk->fops = &null_ops; + nullb->disk->private_data = nullb; + strscpy_pad(nullb->disk->disk_name, nullb->disk_name, DISK_NAME_LEN); + + if (nullb->dev->zoned) { + rv = null_register_zoned_dev(nullb); + if (rv) + goto out_ida_free; + } + + rv = add_disk(nullb->disk); if (rv) goto out_ida_free; -- 2.39.2