From bd0f3e51eb737043518d43b49f15fd4087ba49ed Mon Sep 17 00:00:00 2001 From: Philipp Storz Date: Fri, 21 Dec 2018 00:15:02 -0800 Subject: [PATCH] renamed function --- src/dird/ndmp_dma_backup_NDMP_NATIVE.c | 4 ++-- src/dird/ndmp_dma_restore_NDMP_NATIVE.c | 2 +- src/dird/ndmp_dma_storage.c | 16 ++++++++-------- src/dird/protos.h | 4 ++-- src/dird/storage.c | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/dird/ndmp_dma_backup_NDMP_NATIVE.c b/src/dird/ndmp_dma_backup_NDMP_NATIVE.c index ce02880efe6..2fe9c404686 100644 --- a/src/dird/ndmp_dma_backup_NDMP_NATIVE.c +++ b/src/dird/ndmp_dma_backup_NDMP_NATIVE.c @@ -134,7 +134,7 @@ int ndmp_load_next(struct ndm_session *sess) { goto bail_out; } - slot_number_t slotnumber = get_physical_slotnumber_by_logical_slotnumber(&store->rss->storage_mapping, slot_type_storage, mr.Slot); + slot_number_t slotnumber = get_element_addr_by_slotnumber(&store->rss->storage_mapping, slot_type_storage, mr.Slot); /* * check if lookup_storage_mapping was successful */ @@ -546,7 +546,7 @@ static inline bool extract_post_backup_stats_ndmp_native(JCR *jcr, * translate Physical to Logical Slot before storing into database */ - media->slot_addr = get_logical_slotnumber_by_physical_slotnumber (&jcr->res.wstore->rss->storage_mapping, slot_type_storage, media->slot_addr); + media->slot_addr = get_slotnumber_by_element_addr (&jcr->res.wstore->rss->storage_mapping, slot_type_storage, media->slot_addr); #if 0 Jmsg(jcr, M_INFO, 0, _("Physical Slot is %d\n"), media->slot_addr); Jmsg(jcr, M_INFO, 0, _("Logical slot is : %d\n"), media->slot_addr); diff --git a/src/dird/ndmp_dma_restore_NDMP_NATIVE.c b/src/dird/ndmp_dma_restore_NDMP_NATIVE.c index b64ec39b939..31cbb9b0ac3 100644 --- a/src/dird/ndmp_dma_restore_NDMP_NATIVE.c +++ b/src/dird/ndmp_dma_restore_NDMP_NATIVE.c @@ -303,7 +303,7 @@ static bool do_ndmp_native_restore(JCR *jcr) for (ndmmedia *media = ndmp_job.media_tab.head; media; media = media->next) { Jmsg(jcr, M_INFO, 0, _("Logical slot for volume %s is %d\n"), media->label, media->slot_addr); - ndmp_slot = get_physical_slotnumber_by_logical_slotnumber(&store->rss->storage_mapping, slot_type_storage, media->slot_addr); + ndmp_slot = get_element_addr_by_slotnumber(&store->rss->storage_mapping, slot_type_storage, media->slot_addr); media->slot_addr = ndmp_slot; Jmsg(jcr, M_INFO, 0, _("Physical(NDMP) slot for volume %s is %d\n"), media->label, media->slot_addr); Jmsg(jcr, M_INFO, 0, _("Media Index of volume %s is %d\n"), media->label, media->index); diff --git a/src/dird/ndmp_dma_storage.c b/src/dird/ndmp_dma_storage.c index 89ce521edb0..957f6fbb425 100644 --- a/src/dird/ndmp_dma_storage.c +++ b/src/dird/ndmp_dma_storage.c @@ -570,7 +570,7 @@ dlist *ndmp_get_vol_list(UAContext *ua, STORERES *store, bool listall, bool scan if (edp->Full) { slot_number_t slot_mapping; vl->SlotStatus = slot_status_full; - slot_mapping = get_logical_slotnumber_by_physical_slotnumber(&store->rss->storage_mapping, slot_type_storage, edp->src_se_addr); + slot_mapping = get_slotnumber_by_element_addr(&store->rss->storage_mapping, slot_type_storage, edp->src_se_addr); vl->CurrentlyLoadedSlot = slot_mapping; fill_volume_name(vl, edp); } else { @@ -587,7 +587,7 @@ dlist *ndmp_get_vol_list(UAContext *ua, STORERES *store, bool listall, bool scan /* * Map physical storage address to logical one using the storage mappings. */ - vl->LogicalSlotNumber = get_logical_slotnumber_by_physical_slotnumber(&store->rss->storage_mapping, vl->Type, edp->element_address); + vl->LogicalSlotNumber = get_slotnumber_by_element_addr(&store->rss->storage_mapping, vl->Type, edp->element_address); if (vl->VolName) { Dmsg6(100, "Add phys_slot = %hd logi_slot=%hd loaded=%hd type=%hd status=%hd Vol=%s to SD list.\n", @@ -718,7 +718,7 @@ bool ndmp_transfer_volume(UAContext *ua, STORERES *store, * to physical slot numbers for the actual NDMP operation. */ /* slot_mapping = lookup_storage_mapping(store, slot_type_storage, LOGICAL_TO_PHYSICAL, src_slot); */ - slot_mapping = get_physical_slotnumber_by_logical_slotnumber(&store->rss->storage_mapping, slot_type_storage, src_slot); + slot_mapping = get_element_addr_by_slotnumber(&store->rss->storage_mapping, slot_type_storage, src_slot); if (slot_mapping == -1) { ua->error_msg("No slot mapping for slot %hd\n", src_slot); return retval; @@ -726,7 +726,7 @@ bool ndmp_transfer_volume(UAContext *ua, STORERES *store, ndmp_job.from_addr = slot_mapping; ndmp_job.from_addr_given = 1; - slot_mapping = get_physical_slotnumber_by_logical_slotnumber(&store->rss->storage_mapping, slot_type_storage, dst_slot); + slot_mapping = get_element_addr_by_slotnumber(&store->rss->storage_mapping, slot_type_storage, dst_slot); if (slot_mapping == -1) { ua->error_msg("No slot mapping for slot %hd\n", dst_slot); return retval; @@ -922,7 +922,7 @@ bool ndmp_autochanger_volume_operation(UAContext *ua, STORERES *store, const cha /* * Map the logical address to a physical one. */ - slot_mapping = get_physical_slotnumber_by_logical_slotnumber(&store->rss->storage_mapping, slot_type_storage, slot); + slot_mapping = get_element_addr_by_slotnumber(&store->rss->storage_mapping, slot_type_storage, slot); if (slot_mapping == -1) { ua->error_msg("No slot mapping for slot %hd\n", slot); return retval; @@ -934,7 +934,7 @@ bool ndmp_autochanger_volume_operation(UAContext *ua, STORERES *store, const cha /* * Map the logical address to a physical one. */ - drive_mapping = get_physical_slotnumber_by_logical_slotnumber(&store->rss->storage_mapping, slot_type_drive, slot); + drive_mapping = get_element_addr_by_slotnumber(&store->rss->storage_mapping, slot_type_drive, slot); if (drive_mapping == -1) { ua->error_msg("No slot mapping for drive %hd\n", drive); return retval; @@ -1031,7 +1031,7 @@ bool ndmp_send_label_request(UAContext *ua, STORERES *store, MEDIA_DBR *mr, if (slot > 0) { slot_number_t slot_mapping; - slot_mapping = get_physical_slotnumber_by_logical_slotnumber(&store->rss->storage_mapping, slot_type_storage, slot); + slot_mapping = get_element_addr_by_slotnumber(&store->rss->storage_mapping, slot_type_storage, slot); if (slot_mapping == -1) { ua->error_msg("No slot mapping for slot %hd\n", slot); return retval; @@ -1112,7 +1112,7 @@ bool ndmp_native_setup_robot_and_tape_for_native_backup_job(JCR* jcr, STORERES* return retval; } - driveaddress = get_physical_slotnumber_by_logical_slotnumber(&store->rss->storage_mapping, slot_type_drive, driveindex); + driveaddress = get_element_addr_by_slotnumber(&store->rss->storage_mapping, slot_type_drive, driveindex); if (driveaddress == -1) { Jmsg(jcr, M_ERROR, 0, _("Could not lookup driveaddress for driveindex %d\n"), driveaddress); diff --git a/src/dird/protos.h b/src/dird/protos.h index a01a866d49f..9dacb821142 100644 --- a/src/dird/protos.h +++ b/src/dird/protos.h @@ -363,8 +363,8 @@ void invalidate_vol_list(STORERES *store); int compare_storage_mapping(void *e1, void *e2); struct smc_element_aa; -slot_number_t get_logical_slotnumber_by_physical_slotnumber(smc_element_aa* smc_elem_aa, slot_type slot_type, slot_number_t element_addr); -slot_number_t get_physical_slotnumber_by_logical_slotnumber(smc_element_aa* smc_elem_aa, slot_type slot_type, slot_number_t element_addr); +slot_number_t get_slotnumber_by_element_addr(smc_element_aa* smc_elem_aa, slot_type slot_type, slot_number_t element_addr); +slot_number_t get_element_addr_by_slotnumber(smc_element_aa* smc_elem_aa, slot_type slot_type, slot_number_t element_addr); /* ua_cmds.c */ bool do_a_command(UAContext *ua); diff --git a/src/dird/storage.c b/src/dird/storage.c index 54620a1ebea..9d3c91101cf 100644 --- a/src/dird/storage.c +++ b/src/dird/storage.c @@ -872,7 +872,7 @@ void invalidate_vol_list(STORERES *store) /** * calculate the element address for given slotnumber and slot_type */ -slot_number_t get_physical_slotnumber_by_logical_slotnumber(smc_element_aa *smc_elem_aa, slot_type slot_type, slot_number_t slotnumber) +slot_number_t get_element_addr_by_slotnumber(smc_element_aa *smc_elem_aa, slot_type slot_type, slot_number_t slotnumber) { if (slot_type == slot_type_storage) { if ( (slotnumber > (smc_elem_aa->se_count) ) @@ -924,7 +924,7 @@ slot_number_t get_physical_slotnumber_by_logical_slotnumber(smc_element_aa *smc_ /** * calculate the slotnumber for element address and slot_type */ -slot_number_t get_logical_slotnumber_by_physical_slotnumber(smc_element_aa *smc_elem_aa, slot_type slot_type, slot_number_t element_addr) +slot_number_t get_slotnumber_by_element_addr(smc_element_aa *smc_elem_aa, slot_type slot_type, slot_number_t element_addr) { if (slot_type == slot_type_storage) { if ( (element_addr < smc_elem_aa->se_addr)