Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

target: use new "dbroot" target attribute

This commit updates the target core ALUA and PR
modules to use the new "dbroot" attribute instead
of assuming the target database is in "/var/target".

Signed-off-by: Lee Duncan <lduncan@suse.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

authored by

Lee Duncan and committed by
Nicholas Bellinger
fdddf932 a96e9783

+4 -4
+3 -3
drivers/target/target_core_alua.c
··· 932 932 tg_pt_gp->tg_pt_gp_alua_access_status); 933 933 934 934 snprintf(path, ALUA_METADATA_PATH_LEN, 935 - "/var/target/alua/tpgs_%s/%s", &wwn->unit_serial[0], 935 + "%s/alua/tpgs_%s/%s", db_root, &wwn->unit_serial[0], 936 936 config_item_name(&tg_pt_gp->tg_pt_gp_group.cg_item)); 937 937 938 938 rc = core_alua_write_tpg_metadata(path, md_buf, len); ··· 1275 1275 atomic_read(&lun->lun_tg_pt_secondary_offline), 1276 1276 lun->lun_tg_pt_secondary_stat); 1277 1277 1278 - snprintf(path, ALUA_METADATA_PATH_LEN, "/var/target/alua/%s/%s/lun_%llu", 1279 - se_tpg->se_tpg_tfo->get_fabric_name(), wwn, 1278 + snprintf(path, ALUA_METADATA_PATH_LEN, "%s/alua/%s/%s/lun_%llu", 1279 + db_root, se_tpg->se_tpg_tfo->get_fabric_name(), wwn, 1280 1280 lun->unpacked_lun); 1281 1281 1282 1282 rc = core_alua_write_tpg_metadata(path, md_buf, len);
+1 -1
drivers/target/target_core_pr.c
··· 1985 1985 return -EMSGSIZE; 1986 1986 } 1987 1987 1988 - snprintf(path, 512, "/var/target/pr/aptpl_%s", &wwn->unit_serial[0]); 1988 + snprintf(path, 512, "%s/pr/aptpl_%s", db_root, &wwn->unit_serial[0]); 1989 1989 file = filp_open(path, flags, 0600); 1990 1990 if (IS_ERR(file)) { 1991 1991 pr_err("filp_open(%s) for APTPL metadata"