target/iblock: fix holder printing in iblock_show_configfs_dev_params (57ba1059) · Commits · 戴 / test

bd_contains is never NULL for an open block device. In addition ibd_bd is always set to a block device that was exclusively opened by the target code, so the holder is guranteed to be ib_dev as well. Signed-off-by:

Christoph Hellwig <hch@lst.de> Signed-off-by:

Jens Axboe <axboe@kernel.dk>

drivers/target/target_core_iblock.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -611,9 +611,8 @@ static ssize_t iblock_show_configfs_dev_params(struct se_device dev, char b)
		bl += sprintf(b + bl, " ");
		if (bd) {
		bl += sprintf(b + bl, "Major: %d Minor: %d %s\n",
		MAJOR(bd->bd_dev), MINOR(bd->bd_dev), (!bd->bd_contains) ?
		"" : (bd->bd_holder == ib_dev) ?
		"CLAIMED: IBLOCK" : "CLAIMED: OS");
		MAJOR(bd->bd_dev), MINOR(bd->bd_dev),
		"CLAIMED: IBLOCK");
		} else {
		bl += sprintf(b + bl, "Major: 0 Minor: 0\n");
		}

Admin message