Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdddf932 authored by Lee Duncan's avatar Lee Duncan Committed by Nicholas Bellinger
Browse files

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: default avatarLee Duncan <lduncan@suse.com>
Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent a96e9783

drivers/target/target_core_alua.c

+3 −3
Original line number Diff line number Diff line
@@ -932,7 +932,7 @@ static int core_alua_update_tpg_primary_metadata( 
			tg_pt_gp->tg_pt_gp_alua_access_status);



	snprintf(path, ALUA_METADATA_PATH_LEN,

		"/var/target/alua/tpgs_%s/%s", &wwn->unit_serial[0],

		"%s/alua/tpgs_%s/%s", db_root, &wwn->unit_serial[0],

		config_item_name(&tg_pt_gp->tg_pt_gp_group.cg_item));



	rc = core_alua_write_tpg_metadata(path, md_buf, len);
@@ -1275,8 +1275,8 @@ static int core_alua_update_tpg_secondary_metadata(struct se_lun *lun) 
			atomic_read(&lun->lun_tg_pt_secondary_offline),

			lun->lun_tg_pt_secondary_stat);



	snprintf(path, ALUA_METADATA_PATH_LEN, "/var/target/alua/%s/%s/lun_%llu",

			se_tpg->se_tpg_tfo->get_fabric_name(), wwn,

	snprintf(path, ALUA_METADATA_PATH_LEN, "%s/alua/%s/%s/lun_%llu",

			db_root, se_tpg->se_tpg_tfo->get_fabric_name(), wwn,

			lun->unpacked_lun);



	rc = core_alua_write_tpg_metadata(path, md_buf, len);

drivers/target/target_core_pr.c

+1 −1
Original line number Diff line number Diff line
@@ -1985,7 +1985,7 @@ static int __core_scsi3_write_aptpl_to_file( 
		return -EMSGSIZE;

	}



	snprintf(path, 512, "/var/target/pr/aptpl_%s", &wwn->unit_serial[0]);

	snprintf(path, 512, "%s/pr/aptpl_%s", db_root, &wwn->unit_serial[0]);

	file = filp_open(path, flags, 0600);

	if (IS_ERR(file)) {

		pr_err("filp_open(%s) for APTPL metadata"