From ed0b86b0e9fb3b9c25ef7df23da6b70aab61a7f3 Mon Sep 17 00:00:00 2001 From: Philipp Storz Date: Thu, 22 Nov 2018 03:00:10 -0800 Subject: [PATCH] more rename --- src/dird/dird.h | 8 ++-- src/dird/ndmp_dma_storage.c | 25 +++++----- src/dird/sd_cmds.c | 58 +++++++++++------------ src/dird/storage.c | 22 +++++---- src/dird/ua_impexp.c | 92 ++++++++++++++++++------------------- src/dird/ua_label.c | 14 +++--- src/dird/ua_status.c | 64 +++++++++++++------------- src/dird/ua_update.c | 42 ++++++++--------- 8 files changed, 164 insertions(+), 161 deletions(-) diff --git a/src/dird/dird.h b/src/dird/dird.h index 419b2170176..7ccf1552bd1 100644 --- a/src/dird/dird.h +++ b/src/dird/dird.h @@ -131,13 +131,13 @@ enum s_mapping_type { * Slot list definition */ struct vol_list_t { - dlink link; /**< Link for list */ - slot_number_t SlotNumber; /**< Unique Slot Number */ + dlink link; /** Link for list */ + slot_number_t PhysicalSlotNumber; /**< Unique Slot Number */ + slot_number_t LogicalDriveNumber; /**< Drive number when slot_type_drive or actual slot number */ + slot_number_t CurrentlyLoadedSlot;/**< Volume loaded in drive when slot_type_drive */ slot_flags_t Flags; /**< Slot specific flags see e_slot_flag enum */ slot_type Type; /**< See slot_type_* */ slot_status SlotStatus; /**< See slot_status_* */ - slot_number_t SlotOrDriveNumber; /**< Drive number when slot_type_drive or actual slot number */ - slot_number_t CurrentlyLoadedSlot; /**< Volume loaded in drive when slot_type_drive */ char *VolName; /**< Actual Volume Name */ }; diff --git a/src/dird/ndmp_dma_storage.c b/src/dird/ndmp_dma_storage.c index 477a5524c70..ecbf81f0d35 100644 --- a/src/dird/ndmp_dma_storage.c +++ b/src/dird/ndmp_dma_storage.c @@ -210,7 +210,7 @@ void do_ndmp_native_storage_status(UAContext *ua, STORERES *store, char *cmd) int i = 0; if (store->rss->ndmp_deviceinfo) { ua->info_msg("NDMP Devices for storage %s:(%s)\n", store->name(), store->rss->smc_ident); - ua->info_msg(" SlotNumber Device Model (JobId) \n"); + ua->info_msg(" PhysicalSlotNumber Device Model (JobId) \n"); for (auto devinfo = store->rss->ndmp_deviceinfo->begin(); devinfo != store->rss->ndmp_deviceinfo->end(); devinfo++) { @@ -484,7 +484,7 @@ dlist *ndmp_get_vol_list(UAContext *ua, STORERES *store, bool listall, bool scan } else { vl->SlotStatus = slot_status_empty; } - vl->SlotNumber = edp->element_address; + vl->PhysicalSlotNumber = edp->element_address; break; default: free(vl); @@ -500,7 +500,7 @@ dlist *ndmp_get_vol_list(UAContext *ua, STORERES *store, bool listall, bool scan * Normal slot */ vl->Type = slot_type_storage; - vl->SlotNumber = edp->element_address; + vl->PhysicalSlotNumber = edp->element_address; if (!edp->Full) { free(vl); continue; @@ -529,7 +529,7 @@ dlist *ndmp_get_vol_list(UAContext *ua, STORERES *store, bool listall, bool scan * Normal slot */ vl->Type = slot_type_storage; - vl->SlotNumber = edp->element_address; + vl->PhysicalSlotNumber = edp->element_address; if (edp->Full) { vl->SlotStatus = slot_status_full; fill_volume_name(vl, edp); @@ -539,10 +539,10 @@ dlist *ndmp_get_vol_list(UAContext *ua, STORERES *store, bool listall, bool scan break; case SMC_ELEM_TYPE_IEE: /* - * Import/Export SlotOrDriveNumber + * Import/Export LogicalDriveNumber */ vl->Type = slot_type_import; - vl->SlotNumber = edp->element_address; + vl->PhysicalSlotNumber = edp->element_address; if (edp->Full) { vl->SlotStatus = slot_status_full; fill_volume_name(vl, edp); @@ -566,7 +566,7 @@ dlist *ndmp_get_vol_list(UAContext *ua, STORERES *store, bool listall, bool scan * Drive */ vl->Type = slot_type_drive; - vl->SlotNumber = edp->element_address; + vl->PhysicalSlotNumber = edp->element_address; if (edp->Full) { slot_number_t slot_mapping; @@ -580,7 +580,7 @@ dlist *ndmp_get_vol_list(UAContext *ua, STORERES *store, bool listall, bool scan break; default: vl->Type = slot_type_unknown; - vl->SlotNumber = edp->element_address; + vl->PhysicalSlotNumber = edp->element_address; break; } } @@ -588,14 +588,14 @@ 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->SlotOrDriveNumber = get_slotnumber_by_element_address(store, slot_type_storage, edp->element_address); + vl->LogicalDriveNumber = get_slotnumber_by_element_address(store, vl->Type, edp->element_address); if (vl->VolName) { Dmsg6(100, "Add index = %hd slot=%hd loaded=%hd type=%hd content=%hd Vol=%s to SD list.\n", - vl->SlotNumber, vl->SlotOrDriveNumber, vl->CurrentlyLoadedSlot, vl->Type, vl->SlotStatus, NPRT(vl->VolName)); + vl->PhysicalSlotNumber, vl->LogicalDriveNumber, vl->CurrentlyLoadedSlot, vl->Type, vl->SlotStatus, NPRT(vl->VolName)); } else { Dmsg5(100, "Add index = %hd slot=%hd loaded=%hd type=%hd content=%hd Vol=NULL to SD list.\n", - vl->SlotNumber, vl->SlotOrDriveNumber, vl->CurrentlyLoadedSlot, vl->Type, vl->SlotStatus); + vl->PhysicalSlotNumber, vl->LogicalDriveNumber, vl->CurrentlyLoadedSlot, vl->Type, vl->SlotStatus); } vol_list->binary_insert(vl, storage_compare_vol_list_entry); @@ -664,7 +664,8 @@ slot_number_t ndmp_get_num_slots(UAContext *ua, STORERES *store) return slots; } - return store->rss->storage_mapping.se_count; + return store->rss->storage_mapping.se_count + + store->rss->storage_mapping.iee_count; } /** diff --git a/src/dird/sd_cmds.c b/src/dird/sd_cmds.c index b0be5ff37d1..3c5c65adc16 100644 --- a/src/dird/sd_cmds.c +++ b/src/dird/sd_cmds.c @@ -34,7 +34,7 @@ /* Commands sent to Storage daemon */ static char readlabelcmd[] = - "readlabel %s SlotOrDriveNumber=%hd drive=%hd\n"; + "readlabel %s LogicalDriveNumber=%hd drive=%hd\n"; static char changerlistallcmd[] = "autochanger listall %s \n"; static char changerlistcmd[] = @@ -72,7 +72,7 @@ static char OKSecureEraseCmd[] = /* Commands received from storage daemon that need scanning */ static char readlabelresponse[] = - "3001 Volume=%s SlotOrDriveNumber=%hd"; + "3001 Volume=%s LogicalDriveNumber=%hd"; static char changerslotsresponse[] = "slots=%hd\n"; static char changerdrivesresponse[] = @@ -169,7 +169,7 @@ void close_sd_bsock(UAContext *ua) /** * We get the volume name from the SD */ -char *get_volume_name_from_SD(UAContext *ua, slot_number_t SlotOrDriveNumber, drive_number_t drive) +char *get_volume_name_from_SD(UAContext *ua, slot_number_t LogicalDriveNumber, drive_number_t drive) { BSOCK *sd; STORERES *store = ua->jcr->res.wstore; @@ -190,11 +190,11 @@ char *get_volume_name_from_SD(UAContext *ua, slot_number_t SlotOrDriveNumber, dr * specific slot of the autochanger using the drive number given. * This could change the loaded volume in the drive. */ - sd->fsend(readlabelcmd, dev_name, SlotOrDriveNumber, drive); + sd->fsend(readlabelcmd, dev_name, LogicalDriveNumber, drive); Dmsg1(100, "Sent: %s", sd->msg); /* - * Get Volume name in this SlotOrDriveNumber + * Get Volume name in this LogicalDriveNumber */ while (sd->recv() >= 0) { ua->send_msg("%s", sd->msg); @@ -222,23 +222,23 @@ char *get_volume_name_from_SD(UAContext *ua, slot_number_t SlotOrDriveNumber, dr * * Input (output of mxt-changer list): * - * 0:vol2 SlotOrDriveNumber num:Volume Name + * 0:vol2 LogicalDriveNumber num:Volume Name * * Input (output of mxt-changer listall): * - * Drive content: D:Drive num:F:SlotOrDriveNumber loaded:Volume Name + * Drive content: D:Drive num:F:LogicalDriveNumber loaded:Volume Name * D:0:F:2:vol2 or D:Drive num:E * D:1:F:42:vol42 * D:3:E * - * SlotOrDriveNumber content: - * S:1:F:vol1 S:SlotOrDriveNumber num:F:Volume Name - * S:2:E or S:SlotOrDriveNumber num:E + * LogicalDriveNumber content: + * S:1:F:vol1 S:LogicalDriveNumber num:F:Volume Name + * S:2:E or S:LogicalDriveNumber num:E * S:3:F:vol4 * * Import/Export tray slots: - * I:10:F:vol10 I:SlotOrDriveNumber num:F:Volume Name - * I:11:E or I:SlotOrDriveNumber num:E + * I:10:F:vol10 I:LogicalDriveNumber num:F:Volume Name + * I:11:E or I:LogicalDriveNumber num:E * I:12:F:vol40 * * If a drive is loaded, the slot *should* be empty @@ -360,9 +360,9 @@ dlist *native_get_vol_list(UAContext *ua, STORERES *store, bool listall, bool sc /* * Scanning -- require only valid slot */ - vl->SlotOrDriveNumber = atoi(field1); - if (vl->SlotOrDriveNumber <= 0) { - ua->error_msg(_("Invalid SlotOrDriveNumber number: %s\n"), sd->msg); + vl->LogicalDriveNumber = atoi(field1); + if (vl->LogicalDriveNumber <= 0) { + ua->error_msg(_("Invalid LogicalDriveNumber number: %s\n"), sd->msg); free(vl); continue; } @@ -374,7 +374,7 @@ dlist *native_get_vol_list(UAContext *ua, STORERES *store, bool listall, bool sc } else { vl->SlotStatus = slot_status_empty; } - vl->SlotNumber = INDEX_SLOT_OFFSET + vl->SlotOrDriveNumber; + vl->PhysicalSlotNumber = INDEX_SLOT_OFFSET + vl->LogicalDriveNumber; } else if (!listall) { /* * Not scanning and not listall. @@ -384,8 +384,8 @@ dlist *native_get_vol_list(UAContext *ua, STORERES *store, bool listall, bool sc continue; } - if (!is_an_integer(field1) || (vl->SlotOrDriveNumber = atoi(field1)) <= 0) { - ua->error_msg(_("Invalid SlotOrDriveNumber number: %s\n"), field1); + if (!is_an_integer(field1) || (vl->LogicalDriveNumber = atoi(field1)) <= 0) { + ua->error_msg(_("Invalid LogicalDriveNumber number: %s\n"), field1); free(vl); continue; } @@ -399,7 +399,7 @@ dlist *native_get_vol_list(UAContext *ua, STORERES *store, bool listall, bool sc vl->Type = slot_type_storage; vl->SlotStatus = slot_status_full; vl->VolName = bstrdup(field2); - vl->SlotNumber = INDEX_SLOT_OFFSET + vl->SlotOrDriveNumber; + vl->PhysicalSlotNumber = INDEX_SLOT_OFFSET + vl->LogicalDriveNumber; } else { /* * Listall. @@ -425,31 +425,31 @@ dlist *native_get_vol_list(UAContext *ua, STORERES *store, bool listall, bool sc } /* - * For drives the SlotOrDriveNumber is the actual drive number. + * For drives the LogicalDriveNumber is the actual drive number. * For any other type its the actual slot number. */ switch (vl->Type) { case slot_type_drive: - if (!is_an_integer(field2) || (vl->SlotOrDriveNumber = atoi(field2)) < 0) { + if (!is_an_integer(field2) || (vl->LogicalDriveNumber = atoi(field2)) < 0) { ua->error_msg(_("Invalid Drive number: %s\n"), field2); free(vl); continue; } - vl->SlotNumber = INDEX_DRIVE_OFFSET + vl->SlotOrDriveNumber; - if (vl->SlotNumber >= INDEX_MAX_DRIVES) { + vl->PhysicalSlotNumber = INDEX_DRIVE_OFFSET + vl->LogicalDriveNumber; + if (vl->PhysicalSlotNumber >= INDEX_MAX_DRIVES) { ua->error_msg(_("Drive number %hd greater then INDEX_MAX_DRIVES(%hd) please increase define\n"), - vl->SlotOrDriveNumber, INDEX_MAX_DRIVES); + vl->LogicalDriveNumber, INDEX_MAX_DRIVES); free(vl); continue; } break; default: - if (!is_an_integer(field2) || (vl->SlotOrDriveNumber = atoi(field2)) <= 0) { - ua->error_msg(_("Invalid SlotOrDriveNumber number: %s\n"), field2); + if (!is_an_integer(field2) || (vl->LogicalDriveNumber = atoi(field2)) <= 0) { + ua->error_msg(_("Invalid LogicalDriveNumber number: %s\n"), field2); free(vl); continue; } - vl->SlotNumber = INDEX_SLOT_OFFSET + vl->SlotOrDriveNumber; + vl->PhysicalSlotNumber = INDEX_SLOT_OFFSET + vl->LogicalDriveNumber; break; } @@ -486,10 +486,10 @@ dlist *native_get_vol_list(UAContext *ua, STORERES *store, bool listall, bool sc if (vl->VolName) { Dmsg6(100, "Add index = %hd slot=%hd loaded=%hd type=%hd content=%hd Vol=%s to SD list.\n", - vl->SlotNumber, vl->SlotOrDriveNumber, vl->CurrentlyLoadedSlot, vl->Type, vl->SlotStatus, NPRT(vl->VolName)); + vl->PhysicalSlotNumber, vl->LogicalDriveNumber, vl->CurrentlyLoadedSlot, vl->Type, vl->SlotStatus, NPRT(vl->VolName)); } else { Dmsg5(100, "Add index = %hd slot=%hd loaded=%hd type=%hd content=%hd Vol=NULL to SD list.\n", - vl->SlotNumber, vl->SlotOrDriveNumber, vl->CurrentlyLoadedSlot, vl->Type, vl->SlotStatus); + vl->PhysicalSlotNumber, vl->LogicalDriveNumber, vl->CurrentlyLoadedSlot, vl->Type, vl->SlotStatus); } vol_list->binary_insert(vl, storage_compare_vol_list_entry); diff --git a/src/dird/storage.c b/src/dird/storage.c index d1a43c2b2a3..b8870402040 100644 --- a/src/dird/storage.c +++ b/src/dird/storage.c @@ -533,10 +533,10 @@ int storage_compare_vol_list_entry(void *e1, void *e2) ASSERT(v1); ASSERT(v2); - if (v1->SlotNumber == v2->SlotNumber) { + if (v1->PhysicalSlotNumber == v2->PhysicalSlotNumber) { return 0; } else { - return (v1->SlotNumber < v2->SlotNumber) ? -1 : 1; + return (v1->PhysicalSlotNumber < v2->PhysicalSlotNumber) ? -1 : 1; } } @@ -779,7 +779,7 @@ vol_list_t *vol_is_loaded_in_drive(STORERES *store, changer_vol_list_t *vol_list while (vl) { switch (vl->Type) { case slot_type_drive: - Dmsg2(100, "Checking drive %hd for loaded volume == %hd\n", vl->SlotOrDriveNumber, vl->CurrentlyLoadedSlot); + Dmsg2(100, "Checking drive %hd for loaded volume == %hd\n", vl->LogicalDriveNumber, vl->CurrentlyLoadedSlot); if (vl->CurrentlyLoadedSlot == slot) { return vl; } @@ -870,23 +870,24 @@ void invalidate_vol_list(STORERES *store) } /** - * calculate the element address for given index and slot_type + * calculate the element address for given slotnumber and slot_type */ -slot_number_t get_element_address_by_slotnumber(STORERES *store, slot_type slot_type, slot_number_t index) +slot_number_t get_element_address_by_slotnumber(STORERES *store, slot_type slot_type, slot_number_t slotnumber) { if (slot_type == slot_type_storage) { - return (store->rss->storage_mapping.se_addr + index + return (store->rss->storage_mapping.se_addr + slotnumber - 1); // normal slots count start from 1 } else if(slot_type == slot_type_import) { - return (store->rss->storage_mapping.iee_addr + index + return (store->rss->storage_mapping.iee_addr + slotnumber + - store->rss->storage_mapping.se_count // i/e slots follow after normal slots - 1); // normal slots count start from 1 } else if (slot_type == slot_type_picker) { - return (store->rss->storage_mapping.mte_addr + index); + return (store->rss->storage_mapping.mte_addr + slotnumber); } else if (slot_type == slot_type_drive) { - return (store->rss->storage_mapping.dte_addr + index); + return (store->rss->storage_mapping.dte_addr + slotnumber); } else if (slot_type == slot_type_unknown){ return -1; @@ -897,7 +898,7 @@ slot_number_t get_element_address_by_slotnumber(STORERES *store, slot_type slot_ } /** - * calculate the index for element address and slot_type + * calculate the slotnumber for element address and slot_type */ slot_number_t get_slotnumber_by_element_address(STORERES *store, slot_type slot_type, slot_number_t element_addr) { @@ -907,6 +908,7 @@ slot_number_t get_slotnumber_by_element_address(STORERES *store, slot_type slot_ } else if(slot_type == slot_type_import) { return (element_addr - store->rss->storage_mapping.iee_addr + + store->rss->storage_mapping.se_count // i/e slots follow after normal slots + 1); // slots count start from 1 } else if (slot_type == slot_type_picker) { diff --git a/src/dird/ua_impexp.c b/src/dird/ua_impexp.c index 33b6e693975..112450a101e 100644 --- a/src/dird/ua_impexp.c +++ b/src/dird/ua_impexp.c @@ -94,7 +94,7 @@ static inline void validate_slot_list(UAContext *ua, switch (vl->Type) { case slot_type_storage: case slot_type_import: - if (bit_is_set(vl->SlotOrDriveNumber - 1, slot_list)) { + if (bit_is_set(vl->LogicalDriveNumber - 1, slot_list)) { switch (content) { case slot_status_full: /* @@ -112,12 +112,12 @@ static inline void validate_slot_list(UAContext *ua, */ if (vl->Type == slot_type_storage && vl->SlotStatus == slot_status_empty && - vol_is_loaded_in_drive(store, vol_list, vl->SlotOrDriveNumber) != NULL) { + vol_is_loaded_in_drive(store, vol_list, vl->LogicalDriveNumber) != NULL) { continue; } - Dmsg1(100, "Deselecting slot %hd doesn't have wanted content.\n", vl->SlotOrDriveNumber); - ua->warning_msg(_("Deselecting slot %hd doesn't have wanted content.\n"), vl->SlotOrDriveNumber); - clear_bit(vl->SlotOrDriveNumber - 1, slot_list); + Dmsg1(100, "Deselecting slot %hd doesn't have wanted content.\n", vl->LogicalDriveNumber); + ua->warning_msg(_("Deselecting slot %hd doesn't have wanted content.\n"), vl->LogicalDriveNumber); + clear_bit(vl->LogicalDriveNumber - 1, slot_list); break; case slot_status_empty: /* @@ -133,12 +133,12 @@ static inline void validate_slot_list(UAContext *ua, */ if (vl->Type == slot_type_storage && vl->SlotStatus == slot_status_empty && - vol_is_loaded_in_drive(store, vol_list, vl->SlotOrDriveNumber) == NULL) { + vol_is_loaded_in_drive(store, vol_list, vl->LogicalDriveNumber) == NULL) { continue; } - Dmsg1(100, "Deselecting slot %hd doesn't have wanted content.\n", vl->SlotOrDriveNumber); - ua->warning_msg(_("Deselecting slot %hd doesn't have wanted content.\n"), vl->SlotOrDriveNumber); - clear_bit(vl->SlotOrDriveNumber - 1, slot_list); + Dmsg1(100, "Deselecting slot %hd doesn't have wanted content.\n", vl->LogicalDriveNumber); + ua->warning_msg(_("Deselecting slot %hd doesn't have wanted content.\n"), vl->LogicalDriveNumber); + clear_bit(vl->LogicalDriveNumber - 1, slot_list); break; default: break; @@ -172,7 +172,7 @@ static inline vol_list_t *find_slot_in_list(changer_vol_list_t *vol_list, } break; default: - if (vl->SlotOrDriveNumber == slotnr) { + if (vl->LogicalDriveNumber == slotnr) { return vl; } break; @@ -255,7 +255,7 @@ static inline changer_vol_list_t *scan_slots_for_volnames(UAContext *ua, * if so only get the content for this slot when * it is selected in the slot list. */ - if (src_slot_list && !bit_is_set(vl1->SlotOrDriveNumber - 1, src_slot_list)) { + if (src_slot_list && !bit_is_set(vl1->LogicalDriveNumber - 1, src_slot_list)) { continue; } @@ -265,8 +265,8 @@ static inline changer_vol_list_t *scan_slots_for_volnames(UAContext *ua, free(vl1->VolName); vl1->VolName = NULL; } - vl1->VolName = get_volume_name_from_SD(ua, vl1->SlotOrDriveNumber, drive); - Dmsg2(100, "Got Vol=%s from SD for SlotOrDriveNumber=%hd\n", vl1->VolName, vl1->SlotOrDriveNumber); + vl1->VolName = get_volume_name_from_SD(ua, vl1->LogicalDriveNumber, drive); + Dmsg2(100, "Got Vol=%s from SD for LogicalDriveNumber=%hd\n", vl1->VolName, vl1->LogicalDriveNumber); break; case slot_status_empty: /* @@ -274,13 +274,13 @@ static inline changer_vol_list_t *scan_slots_for_volnames(UAContext *ua, * loaded in a drive. */ if (vl1->Type == slot_type_storage && - (vl2 = vol_is_loaded_in_drive(store, vol_list, vl1->SlotOrDriveNumber)) != NULL) { + (vl2 = vol_is_loaded_in_drive(store, vol_list, vl1->LogicalDriveNumber)) != NULL) { if (vl2->VolName) { free(vl2->VolName); vl2->VolName = NULL; } - vl2->VolName = get_volume_name_from_SD(ua, vl1->SlotOrDriveNumber, drive); - Dmsg2(100, "Got Vol=%s from SD for SlotOrDriveNumber=%hd\n", vl2->VolName, vl1->SlotOrDriveNumber); + vl2->VolName = get_volume_name_from_SD(ua, vl1->LogicalDriveNumber, drive); + Dmsg2(100, "Got Vol=%s from SD for LogicalDriveNumber=%hd\n", vl2->VolName, vl1->LogicalDriveNumber); } break; default: @@ -324,7 +324,7 @@ static inline changer_vol_list_t *scan_slots_for_volnames(UAContext *ua, /* * Lookup the drive in the old list. */ - vls.SlotNumber = vl1->SlotNumber; + vls.PhysicalSlotNumber = vl1->PhysicalSlotNumber; vl2 = (vol_list_t *)vol_list->contents->binary_search((void *)&vls, storage_compare_vol_list_entry); if (vl2 && vl2->SlotStatus == slot_status_full && @@ -364,7 +364,7 @@ static inline changer_vol_list_t *scan_slots_for_volnames(UAContext *ua, * if so only get the content for this slot when * it is selected in the slot list. */ - if (src_slot_list && !bit_is_set(vl1->SlotOrDriveNumber - 1, src_slot_list)) { + if (src_slot_list && !bit_is_set(vl1->LogicalDriveNumber - 1, src_slot_list)) { continue; } switch (vl1->SlotStatus) { @@ -372,11 +372,11 @@ static inline changer_vol_list_t *scan_slots_for_volnames(UAContext *ua, /* * Lookup the slot in the old list. */ - vls.SlotNumber = vl1->SlotNumber; + vls.PhysicalSlotNumber = vl1->PhysicalSlotNumber; vl2 = (vol_list_t *)vol_list->contents->binary_search((void *)&vls, storage_compare_vol_list_entry); if (vl2 && vl2->SlotStatus == slot_status_full && - vl2->SlotOrDriveNumber == vl1->SlotOrDriveNumber) { + vl2->LogicalDriveNumber == vl1->LogicalDriveNumber) { /* * Volume in slot is the same copy the volume name. */ @@ -391,7 +391,7 @@ static inline changer_vol_list_t *scan_slots_for_volnames(UAContext *ua, * into the same slot it was taken from. But as we have the * code to lookup the old place we take a shot at it. */ - vl2 = find_slot_in_list(vol_list, vl1->SlotOrDriveNumber); + vl2 = find_slot_in_list(vol_list, vl1->LogicalDriveNumber); if (vl2) { if (vl2->VolName) { free(vl2->VolName); @@ -443,7 +443,7 @@ static inline bool get_slot_list_using_volname(UAContext *ua, * When the source slot list is limited we check to * see if this slot should be taken into consideration. */ - if (wanted_slot_list && !bit_is_set(vl1->SlotOrDriveNumber - 1, wanted_slot_list)) { + if (wanted_slot_list && !bit_is_set(vl1->LogicalDriveNumber - 1, wanted_slot_list)) { continue; } @@ -453,7 +453,7 @@ static inline bool get_slot_list_using_volname(UAContext *ua, * See if the wanted volume is loaded in this slot. */ Dmsg3(100, "Checking for volume name in slot %hd, wanted %s, found %s\n", - vl1->SlotOrDriveNumber, volumename, (vl1->VolName) ? vl1->VolName : "NULL"); + vl1->LogicalDriveNumber, volumename, (vl1->VolName) ? vl1->VolName : "NULL"); if (vl1->VolName && bstrcmp(vl1->VolName, volumename)) { found = true; } @@ -462,15 +462,15 @@ static inline bool get_slot_list_using_volname(UAContext *ua, /* * See if this slot is loaded in drive and drive contains wanted volume */ - vl2 = vol_is_loaded_in_drive(store, vol_list, vl1->SlotOrDriveNumber); + vl2 = vol_is_loaded_in_drive(store, vol_list, vl1->LogicalDriveNumber); if (vl2 != NULL) { Dmsg3(100, "Checking for volume name in drive %hd, wanted %s, found %s\n", - vl2->SlotOrDriveNumber, volumename, (vl2->VolName) ? vl2->VolName : "NULL"); + vl2->LogicalDriveNumber, volumename, (vl2->VolName) ? vl2->VolName : "NULL"); if (vl2->VolName && bstrcmp(vl2->VolName, volumename)) { found = true; } } else { - Dmsg1(100, "Skipping empty slot %hd\n", vl1->SlotOrDriveNumber); + Dmsg1(100, "Skipping empty slot %hd\n", vl1->LogicalDriveNumber); } break; default: @@ -496,7 +496,7 @@ static inline bool get_slot_list_using_volname(UAContext *ua, * volumename was not found. */ if (found) { - set_bit(vl1->SlotOrDriveNumber - 1, selected_slot_list); + set_bit(vl1->LogicalDriveNumber - 1, selected_slot_list); } else { Dmsg1(100, "No volume named %s in changer or in selected source slots.\n", volumename); ua->warning_msg(_("No volume named %s in changer or in selected source slots.\n"), volumename); @@ -595,7 +595,7 @@ static inline slot_number_t auto_fill_slot_selection(STORERES *store, if (vl->Type != type || vl->SlotStatus != content) { Dmsg3(100, "Skipping slot %hd, Type %hd, SlotStatus %hd\n", - vl->SlotOrDriveNumber, vl->Type, vl->SlotStatus); + vl->LogicalDriveNumber, vl->Type, vl->SlotStatus); continue; } @@ -606,9 +606,9 @@ static inline slot_number_t auto_fill_slot_selection(STORERES *store, */ if (type == slot_type_storage && content == slot_status_empty && - vol_is_loaded_in_drive(store, vol_list, vl->SlotOrDriveNumber) != NULL) { + vol_is_loaded_in_drive(store, vol_list, vl->LogicalDriveNumber) != NULL) { Dmsg3(100, "Skipping slot %hd, Type %hd, SlotStatus %hd is empty but loaded in drive\n", - vl->SlotOrDriveNumber, vl->Type, vl->SlotStatus); + vl->LogicalDriveNumber, vl->Type, vl->SlotStatus); continue; } @@ -617,8 +617,8 @@ static inline slot_number_t auto_fill_slot_selection(STORERES *store, * And increase the number of slots selected. */ Dmsg3(100, "Selected slot %hd which has slot_type %hd and content_type %hd\n", - vl->SlotOrDriveNumber, vl->Type, vl->SlotStatus); - set_bit(vl->SlotOrDriveNumber - 1, slot_list); + vl->LogicalDriveNumber, vl->Type, vl->SlotStatus); + set_bit(vl->LogicalDriveNumber - 1, slot_list); cnt++; } return cnt; @@ -648,7 +648,7 @@ static inline bool verify_slot_list(STORERES *store, switch (vl->Type) { case slot_type_storage: case slot_type_import: - if (bit_is_set(vl->SlotOrDriveNumber - 1, slot_list)) { + if (bit_is_set(vl->LogicalDriveNumber - 1, slot_list)) { /* * If the type and content is ok we can continue with the next one. */ @@ -669,14 +669,14 @@ static inline bool verify_slot_list(STORERES *store, if (vl->Type == slot_type_storage) { switch (content) { case slot_status_empty: - if (vol_is_loaded_in_drive(store, vol_list, vl->SlotOrDriveNumber) != NULL) { + if (vol_is_loaded_in_drive(store, vol_list, vl->LogicalDriveNumber) != NULL) { Dmsg3(100, "Skipping slot %hd, Type %hd, SlotStatus %hd is empty but loaded in drive\n", - vl->SlotOrDriveNumber, vl->Type, vl->SlotStatus); + vl->LogicalDriveNumber, vl->Type, vl->SlotStatus); return false; } break; case slot_status_full: - if (vol_is_loaded_in_drive(store, vol_list, vl->SlotOrDriveNumber) != NULL) { + if (vol_is_loaded_in_drive(store, vol_list, vl->LogicalDriveNumber) != NULL) { continue; } break; @@ -689,7 +689,7 @@ static inline bool verify_slot_list(STORERES *store, * Not the wanted type or content and not a special case. */ Dmsg3(100, "Skipping slot %hd, Type %hd, SlotStatus %hd\n", - vl->SlotOrDriveNumber, vl->Type, vl->SlotStatus); + vl->LogicalDriveNumber, vl->Type, vl->SlotStatus); return false; } break; @@ -720,7 +720,7 @@ static inline bool update_internal_slot_list(changer_vol_list_t *vol_list, case slot_type_drive: continue; default: - if (vl1->SlotOrDriveNumber == source) { + if (vl1->LogicalDriveNumber == source) { found = true; } break; @@ -736,7 +736,7 @@ static inline bool update_internal_slot_list(changer_vol_list_t *vol_list, case slot_type_drive: continue; default: - if (vl2->SlotOrDriveNumber == destination) { + if (vl2->LogicalDriveNumber == destination) { found = true; } break; @@ -755,7 +755,7 @@ static inline bool update_internal_slot_list(changer_vol_list_t *vol_list, vl1->VolName = NULL; vl1->SlotStatus = slot_status_empty; Dmsg5(100, "Update internal slotlist slot %hd with volname %s, content %hd and slot %hd with content %hd and volname NULL\n", - vl2->SlotOrDriveNumber, (vl2->VolName) ? vl2->VolName : "NULL", vl2->SlotStatus, vl1->SlotOrDriveNumber, vl1->SlotStatus); + vl2->LogicalDriveNumber, (vl2->VolName) ? vl2->VolName : "NULL", vl2->SlotStatus, vl1->LogicalDriveNumber, vl1->SlotStatus); return true; } return false; @@ -783,7 +783,7 @@ static bool release_loaded_volume(UAContext *ua, foreach_dlist(vl1, vol_list->contents) { switch (vl1->Type) { case slot_type_drive: - if (vl1->SlotOrDriveNumber == drive) { + if (vl1->LogicalDriveNumber == drive) { found = true; } break; @@ -808,7 +808,7 @@ static bool release_loaded_volume(UAContext *ua, case slot_type_drive: continue; default: - if (vl2->SlotOrDriveNumber == vl1->CurrentlyLoadedSlot) { + if (vl2->LogicalDriveNumber == vl1->CurrentlyLoadedSlot) { found = true; } break; @@ -828,7 +828,7 @@ static bool release_loaded_volume(UAContext *ua, vl1->SlotStatus = slot_status_empty; vl1->CurrentlyLoadedSlot = 0; Dmsg5(100, "Update internal slotlist slot %hd with volname %s, content %hd and slot %hd with content %hd and volname NULL\n", - vl2->SlotOrDriveNumber, (vl2->VolName) ? vl2->VolName : "NULL", vl2->SlotStatus, vl1->SlotOrDriveNumber, vl1->SlotStatus); + vl2->LogicalDriveNumber, (vl2->VolName) ? vl2->VolName : "NULL", vl2->SlotStatus, vl1->LogicalDriveNumber, vl1->SlotStatus); return true; } return false; @@ -922,9 +922,9 @@ static char *move_volumes_in_autochanger(UAContext *ua, */ vl = vol_is_loaded_in_drive(store, vol_list, transfer_from); if (vl != NULL) { - if (!release_loaded_volume(ua, store, vl->SlotOrDriveNumber, vol_list)) { - Dmsg1(100, "Failed to release volume in drive %hd\n", vl->SlotOrDriveNumber); - ua->warning_msg(_("Failed to release volume in drive %hd\n"), vl->SlotOrDriveNumber); + if (!release_loaded_volume(ua, store, vl->LogicalDriveNumber, vol_list)) { + Dmsg1(100, "Failed to release volume in drive %hd\n", vl->LogicalDriveNumber); + ua->warning_msg(_("Failed to release volume in drive %hd\n"), vl->LogicalDriveNumber); continue; } } diff --git a/src/dird/ua_label.c b/src/dird/ua_label.c index 0964569a95a..33c68fefa27 100644 --- a/src/dird/ua_label.c +++ b/src/dird/ua_label.c @@ -321,10 +321,10 @@ static void label_from_barcodes(UAContext *ua, drive_number_t drive, "Slot Volume\n" "==============\n")); foreach_dlist(vl, vol_list->contents) { - if (!vl->VolName || !bit_is_set(vl->SlotOrDriveNumber - 1, slot_list)) { + if (!vl->VolName || !bit_is_set(vl->LogicalDriveNumber - 1, slot_list)) { continue; } - ua->send_msg("%4d %s\n", vl->SlotOrDriveNumber, vl->VolName); + ua->send_msg("%4d %s\n", vl->LogicalDriveNumber, vl->VolName); } if (!yes && @@ -344,7 +344,7 @@ static void label_from_barcodes(UAContext *ua, drive_number_t drive, * Fire off the label requests */ foreach_dlist(vl, vol_list->contents) { - if (!vl->VolName || !bit_is_set(vl->SlotOrDriveNumber - 1, slot_list)) { + if (!vl->VolName || !bit_is_set(vl->LogicalDriveNumber - 1, slot_list)) { continue; } memset(&mr, 0, sizeof(mr)); @@ -353,8 +353,8 @@ static void label_from_barcodes(UAContext *ua, drive_number_t drive, if (ua->db->get_media_record(ua->jcr, &mr)) { if (mr.VolBytes != 0) { ua->warning_msg(_("Media record for Slot %hd Volume \"%s\" already exists.\n"), - vl->SlotOrDriveNumber, mr.VolumeName); - mr.Slot = vl->SlotOrDriveNumber; + vl->LogicalDriveNumber, mr.VolumeName); + mr.Slot = vl->LogicalDriveNumber; mr.InChanger = mr.Slot > 0; /* if slot give assume in changer */ set_storageid_in_mr(store, &mr); if (!ua->db->update_media_record(ua->jcr, &mr)) { @@ -413,8 +413,8 @@ static void label_from_barcodes(UAContext *ua, drive_number_t drive, } } - mr.Slot = vl->SlotOrDriveNumber; - send_label_request(ua, store, &mr, NULL, &pr, media_record_exists, false, drive, vl->SlotOrDriveNumber); + mr.Slot = vl->LogicalDriveNumber; + send_label_request(ua, store, &mr, NULL, &pr, media_record_exists, false, drive, vl->LogicalDriveNumber); } bail_out: diff --git a/src/dird/ua_status.c b/src/dird/ua_status.c index cb1917a4726..319cbf44bec 100644 --- a/src/dird/ua_status.c +++ b/src/dird/ua_status.c @@ -1430,10 +1430,10 @@ static void status_content_api(UAContext *ua, STORERES *store) case slot_type_drive: switch (vl1->SlotStatus) { case slot_status_full: - ua->send_msg(slot_api_drive_full_format, 'D', vl1->SlotOrDriveNumber, vl1->CurrentlyLoadedSlot, vl1->VolName); + ua->send_msg(slot_api_drive_full_format, 'D', vl1->LogicalDriveNumber, vl1->CurrentlyLoadedSlot, vl1->VolName); break; case slot_status_empty: - ua->send_msg(slot_api_drive_empty_format, 'D', vl1->SlotOrDriveNumber); + ua->send_msg(slot_api_drive_empty_format, 'D', vl1->LogicalDriveNumber); break; default: break; @@ -1445,10 +1445,10 @@ static void status_content_api(UAContext *ua, STORERES *store) case slot_status_full: switch (vl1->Type) { case slot_type_storage: - content_send_info_api(ua, 'S', vl1->SlotOrDriveNumber, vl1->VolName); + content_send_info_api(ua, 'S', vl1->LogicalDriveNumber, vl1->VolName); break; case slot_type_import: - content_send_info_api(ua, 'I', vl1->SlotOrDriveNumber, vl1->VolName); + content_send_info_api(ua, 'I', vl1->LogicalDriveNumber, vl1->VolName); break; default: break; @@ -1459,14 +1459,14 @@ static void status_content_api(UAContext *ua, STORERES *store) * See if this empty slot is empty because the volume is loaded * in one of the drives. */ - vl2 = vol_is_loaded_in_drive(store, vol_list, vl1->SlotOrDriveNumber); + vl2 = vol_is_loaded_in_drive(store, vol_list, vl1->LogicalDriveNumber); if (vl2) { switch (vl1->Type) { case slot_type_storage: - content_send_info_api(ua, 'S', vl1->SlotOrDriveNumber, vl2->VolName); + content_send_info_api(ua, 'S', vl1->LogicalDriveNumber, vl2->VolName); break; case slot_type_import: - content_send_info_api(ua, 'I', vl1->SlotOrDriveNumber, vl2->VolName); + content_send_info_api(ua, 'I', vl1->LogicalDriveNumber, vl2->VolName); break; default: break; @@ -1476,10 +1476,10 @@ static void status_content_api(UAContext *ua, STORERES *store) switch (vl1->Type) { case slot_type_storage: - ua->send_msg(slot_api_slot_empty_format, 'S', vl1->SlotOrDriveNumber); + ua->send_msg(slot_api_slot_empty_format, 'S', vl1->LogicalDriveNumber); break; case slot_type_import: - ua->send_msg(slot_api_slot_empty_format, 'I', vl1->SlotOrDriveNumber); + ua->send_msg(slot_api_slot_empty_format, 'I', vl1->LogicalDriveNumber); break; default: break; @@ -1524,7 +1524,7 @@ static void status_content_json(UAContext *ua, STORERES *store) case slot_type_drive: ua->send->object_start(); ua->send->object_key_value("type", "drive", "%s\n"); - ua->send->object_key_value("slotnr", vl1->SlotOrDriveNumber, "%hd\n"); + ua->send->object_key_value("slotnr", vl1->LogicalDriveNumber, "%hd\n"); switch (vl1->SlotStatus) { case slot_status_full: ua->send->object_key_value("content", "full", "%s\n"); @@ -1545,10 +1545,10 @@ static void status_content_json(UAContext *ua, STORERES *store) case slot_status_full: switch (vl1->Type) { case slot_type_storage: - content_send_info_json(ua, "slot", vl1->SlotOrDriveNumber, vl1->VolName); + content_send_info_json(ua, "slot", vl1->LogicalDriveNumber, vl1->VolName); break; case slot_type_import: - content_send_info_json(ua, "import_slot", vl1->SlotOrDriveNumber, vl1->VolName); + content_send_info_json(ua, "import_slot", vl1->LogicalDriveNumber, vl1->VolName); break; default: break; @@ -1559,14 +1559,14 @@ static void status_content_json(UAContext *ua, STORERES *store) * See if this empty slot is empty because the volume is loaded * in one of the drives. */ - vl2 = vol_is_loaded_in_drive(store, vol_list, vl1->SlotOrDriveNumber); + vl2 = vol_is_loaded_in_drive(store, vol_list, vl1->LogicalDriveNumber); if (vl2) { switch (vl1->Type) { case slot_type_storage: - content_send_info_json(ua, "slot", vl1->SlotOrDriveNumber, vl2->VolName); + content_send_info_json(ua, "slot", vl1->LogicalDriveNumber, vl2->VolName); break; case slot_type_import: - content_send_info_json(ua, "import_slot", vl1->SlotOrDriveNumber, vl2->VolName); + content_send_info_json(ua, "import_slot", vl1->LogicalDriveNumber, vl2->VolName); break; default: break; @@ -1578,14 +1578,14 @@ static void status_content_json(UAContext *ua, STORERES *store) case slot_type_storage: ua->send->object_start(); ua->send->object_key_value("type", "slot", "%s\n"); - ua->send->object_key_value("slotnr", vl1->SlotOrDriveNumber, "%hd\n"); + ua->send->object_key_value("slotnr", vl1->LogicalDriveNumber, "%hd\n"); ua->send->object_key_value("content", "empty", "%s\n"); ua->send->object_end(); break; case slot_type_import: ua->send->object_start(); ua->send->object_key_value("type", "import_slot", "%s\n"); - ua->send->object_key_value("slotnr", vl1->SlotOrDriveNumber, "%hd\n"); + ua->send->object_key_value("slotnr", vl1->LogicalDriveNumber, "%hd\n"); ua->send->object_key_value("content", "empty", "%s\n"); ua->send->object_end(); break; @@ -1672,16 +1672,16 @@ static void status_slots(UAContext *ua, STORERES *store) continue; case slot_type_storage: case slot_type_import: - if (vl1->SlotOrDriveNumber > max_slots) { + if (vl1->LogicalDriveNumber > max_slots) { ua->warning_msg(_("Slot %hd greater than max %hd ignored.\n"), - vl1->SlotOrDriveNumber, max_slots); + vl1->LogicalDriveNumber, max_slots); continue; } /* * Check if user wants us to look at this slot */ - if (!bit_is_set(vl1->SlotOrDriveNumber - 1, slot_list)) { - Dmsg1(100, "Skipping slot=%hd\n", vl1->SlotOrDriveNumber); + if (!bit_is_set(vl1->LogicalDriveNumber - 1, slot_list)) { + Dmsg1(100, "Skipping slot=%hd\n", vl1->LogicalDriveNumber); continue; } @@ -1692,16 +1692,16 @@ static void status_slots(UAContext *ua, STORERES *store) * See if this empty slot is empty because the volume is loaded * in one of the drives. */ - vl2 = vol_is_loaded_in_drive(store, vol_list, vl1->SlotOrDriveNumber); + vl2 = vol_is_loaded_in_drive(store, vol_list, vl1->LogicalDriveNumber); if (!vl2) { ua->send_msg(slot_hformat, - vl1->SlotOrDriveNumber, '*', + vl1->LogicalDriveNumber, '*', "?", "?", "?", "?"); continue; } } else { ua->send_msg(slot_hformat, - vl1->SlotOrDriveNumber, '@', + vl1->LogicalDriveNumber, '@', "?", "?", "?", "?"); continue; } @@ -1715,9 +1715,9 @@ static void status_slots(UAContext *ua, STORERES *store) */ if (vl1->SlotStatus == slot_status_full) { if (!vl1->VolName) { - Dmsg1(100, "No VolName for Slot=%hd.\n", vl1->SlotOrDriveNumber); + Dmsg1(100, "No VolName for Slot=%hd.\n", vl1->LogicalDriveNumber); ua->send_msg(slot_hformat, - vl1->SlotOrDriveNumber, + vl1->LogicalDriveNumber, (vl1->Type == slot_type_import) ? '@' : '*', "?", "?", "?", "?"); continue; @@ -1727,9 +1727,9 @@ static void status_slots(UAContext *ua, STORERES *store) bstrncpy(mr.VolumeName, vl1->VolName, sizeof(mr.VolumeName)); } else { if (!vl2 || !vl2->VolName) { - Dmsg1(100, "No VolName for Slot=%hd.\n", vl1->SlotOrDriveNumber); + Dmsg1(100, "No VolName for Slot=%hd.\n", vl1->LogicalDriveNumber); ua->send_msg(slot_hformat, - vl1->SlotOrDriveNumber, + vl1->LogicalDriveNumber, (vl1->Type == slot_type_import) ? '@' : '*', "?", "?", "?", "?"); continue; @@ -1751,17 +1751,17 @@ static void status_slots(UAContext *ua, STORERES *store) */ if (vl1->Type == slot_type_import) { ua->send_msg(slot_hformat, - vl1->SlotOrDriveNumber, '@', + vl1->LogicalDriveNumber, '@', mr.VolumeName, mr.VolStatus, mr.MediaType, pr.Name); } else { ua->send_msg(slot_hformat, - vl1->SlotOrDriveNumber, - ((vl1->SlotOrDriveNumber == mr.Slot) ? (vl2 ? '%' : ' ') : '*'), + vl1->LogicalDriveNumber, + ((vl1->LogicalDriveNumber == mr.Slot) ? (vl2 ? '%' : ' ') : '*'), mr.VolumeName, mr.VolStatus, mr.MediaType, pr.Name); } } else { ua->send_msg(slot_hformat, - vl1->SlotOrDriveNumber, + vl1->LogicalDriveNumber, (vl1->Type == slot_type_import) ? '@' : '*', mr.VolumeName, "?", "?", "?"); } diff --git a/src/dird/ua_update.c b/src/dird/ua_update.c index ce0b740de27..7d4d1ac164a 100644 --- a/src/dird/ua_update.c +++ b/src/dird/ua_update.c @@ -1140,15 +1140,15 @@ static void update_slots(UAContext *ua) */ memset(&mr, 0, sizeof(mr)); foreach_dlist(vl, vol_list->contents) { - if (vl->SlotOrDriveNumber > max_slots) { - ua->warning_msg(_("Slot %d greater than max %d ignored.\n"), vl->SlotOrDriveNumber, max_slots); + if (vl->LogicalDriveNumber > max_slots) { + ua->warning_msg(_("Slot %d greater than max %d ignored.\n"), vl->LogicalDriveNumber, max_slots); continue; } /* * Check if user wants us to look at this slot */ - if (!bit_is_set(vl->SlotOrDriveNumber - 1, slot_list)) { - Dmsg1(100, "Skipping slot=%d\n", vl->SlotOrDriveNumber); + if (!bit_is_set(vl->LogicalDriveNumber - 1, slot_list)) { + Dmsg1(100, "Skipping slot=%d\n", vl->LogicalDriveNumber); continue; } /* @@ -1159,12 +1159,12 @@ static void update_slots(UAContext *ua) free(vl->VolName); vl->VolName = NULL; } - vl->VolName = get_volume_name_from_SD(ua, vl->SlotOrDriveNumber, drive); - Dmsg2(100, "Got Vol=%s from SD for Slot=%d\n", vl->VolName, vl->SlotOrDriveNumber); + vl->VolName = get_volume_name_from_SD(ua, vl->LogicalDriveNumber, drive); + Dmsg2(100, "Got Vol=%s from SD for Slot=%d\n", vl->VolName, vl->LogicalDriveNumber); } - clear_bit(vl->SlotOrDriveNumber - 1, slot_list); /* clear Slot */ + clear_bit(vl->LogicalDriveNumber - 1, slot_list); /* clear Slot */ set_storageid_in_mr(store.store, &mr); - mr.Slot = vl->SlotOrDriveNumber; + mr.Slot = vl->LogicalDriveNumber; mr.InChanger = 1; mr.MediaId = 0; /* Get by VolumeName */ if (vl->VolName) { @@ -1186,8 +1186,8 @@ static void update_slots(UAContext *ua) mr.VolumeName, mr.Slot, mr.InChanger, mr.StorageId); if (!vl->VolName) { - Dmsg1(100, "No VolName for Slot=%d setting InChanger to zero.\n", vl->SlotOrDriveNumber); - ua->info_msg(_("No VolName for Slot=%d InChanger set to zero.\n"), vl->SlotOrDriveNumber); + Dmsg1(100, "No VolName for Slot=%d setting InChanger to zero.\n", vl->LogicalDriveNumber); + ua->info_msg(_("No VolName for Slot=%d InChanger set to zero.\n"), vl->LogicalDriveNumber); continue; } @@ -1200,8 +1200,8 @@ static void update_slots(UAContext *ua) /* * If Slot, Inchanger, and StorageId have changed, update the Media record */ - if (mr.Slot != vl->SlotOrDriveNumber || !mr.InChanger || mr.StorageId != store.store->StorageId) { - mr.Slot = vl->SlotOrDriveNumber; + if (mr.Slot != vl->LogicalDriveNumber || !mr.InChanger || mr.StorageId != store.store->StorageId) { + mr.Slot = vl->LogicalDriveNumber; mr.InChanger = 1; if (have_enabled) { mr.Enabled = Enabled; @@ -1218,7 +1218,7 @@ static void update_slots(UAContext *ua) } } else { ua->warning_msg(_("Volume \"%s\" not found in catalog. Slot=%d InChanger set to zero.\n"), - mr.VolumeName, vl->SlotOrDriveNumber); + mr.VolumeName, vl->LogicalDriveNumber); } db_unlock(ua->db); } @@ -1289,7 +1289,7 @@ void update_slots_from_vol_list(UAContext *ua, STORERES *store, changer_vol_list /* * Only update entries of slots marked in the slot_list. */ - if (!bit_is_set(vl->SlotOrDriveNumber - 1, slot_list)) { + if (!bit_is_set(vl->LogicalDriveNumber - 1, slot_list)) { continue; } @@ -1297,7 +1297,7 @@ void update_slots_from_vol_list(UAContext *ua, STORERES *store, changer_vol_list * Set InChanger to zero for this Slot */ memset(&mr, 0, sizeof(mr)); - mr.Slot = vl->SlotOrDriveNumber; + mr.Slot = vl->LogicalDriveNumber; mr.InChanger = 1; mr.MediaId = 0; /* Get by VolumeName */ if (vl->VolName) { @@ -1326,7 +1326,7 @@ void update_slots_from_vol_list(UAContext *ua, STORERES *store, changer_vol_list switch (vl->SlotStatus) { case slot_status_full: if (!vl->VolName) { - Dmsg1(100, "No VolName for Slot=%d setting InChanger to zero.\n", vl->SlotOrDriveNumber); + Dmsg1(100, "No VolName for Slot=%d setting InChanger to zero.\n", vl->LogicalDriveNumber); continue; } break; @@ -1345,8 +1345,8 @@ void update_slots_from_vol_list(UAContext *ua, STORERES *store, changer_vol_list Dmsg4(100, "After get MR: Vol=%s slot=%d inchanger=%d sid=%d\n", mr.VolumeName, mr.Slot, mr.InChanger, mr.StorageId); /* If Slot, Inchanger, and StorageId have changed, update the Media record */ - if (mr.Slot != vl->SlotOrDriveNumber || !mr.InChanger || mr.StorageId != store->StorageId) { - mr.Slot = vl->SlotOrDriveNumber; + if (mr.Slot != vl->LogicalDriveNumber || !mr.InChanger || mr.StorageId != store->StorageId) { + mr.Slot = vl->LogicalDriveNumber; mr.InChanger = 1; set_storageid_in_mr(store, &mr); if (!ua->db->update_media_record(ua->jcr, &mr)) { @@ -1355,7 +1355,7 @@ void update_slots_from_vol_list(UAContext *ua, STORERES *store, changer_vol_list } } else { ua->warning_msg(_("Volume \"%s\" not found in catalog. Slot=%d InChanger set to zero.\n"), - mr.VolumeName, vl->SlotOrDriveNumber); + mr.VolumeName, vl->LogicalDriveNumber); } db_unlock(ua->db); } @@ -1394,7 +1394,7 @@ void update_inchanger_for_export(UAContext *ua, STORERES *store, changer_vol_lis /* * Only update entries of slots marked in the slot_list. */ - if (!bit_is_set(vl->SlotOrDriveNumber - 1, slot_list)) { + if (!bit_is_set(vl->LogicalDriveNumber - 1, slot_list)) { continue; } @@ -1402,7 +1402,7 @@ void update_inchanger_for_export(UAContext *ua, STORERES *store, changer_vol_lis * Set InChanger to zero for this Slot */ memset(&mr, 0, sizeof(mr)); - mr.Slot = vl->SlotOrDriveNumber; + mr.Slot = vl->LogicalDriveNumber; mr.InChanger = 1; mr.MediaId = 0; /* Get by VolumeName */ if (vl->VolName) {