From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 9B0DF69C0F for ; Wed, 28 Jul 2021 12:05:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9895622E37 for ; Wed, 28 Jul 2021 12:05:13 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 75BF622E1F for ; Wed, 28 Jul 2021 12:05:12 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 4E8F0425B4 for ; Wed, 28 Jul 2021 12:05:12 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Wed, 28 Jul 2021 12:05:09 +0200 Message-Id: <20210728100511.2862784-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210728100511.2862784-1-d.csapak@proxmox.com> References: <20210728100511.2862784-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.499 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox-backup 1/3] tape: changer: remove unnecesary inquiry parameter X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2021 10:05:13 -0000 this is never used, so remove it. Ok, since they are only non public functions. Signed-off-by: Dominik Csapak --- src/tape/changer/sg_pt_changer.rs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/tape/changer/sg_pt_changer.rs b/src/tape/changer/sg_pt_changer.rs index 3124b96f..2c5434f6 100644 --- a/src/tape/changer/sg_pt_changer.rs +++ b/src/tape/changer/sg_pt_changer.rs @@ -24,7 +24,6 @@ use crate::{ tools::sgutils2::{ SgRaw, SENSE_KEY_NOT_READY, - InquiryInfo, ScsiError, scsi_ascii_to_string, scsi_inquiry, @@ -319,7 +318,6 @@ fn scsi_read_element_status_cdb( // query a single element type from the changer fn get_element( - inquiry: &InquiryInfo, sg_raw: &mut SgRaw, element_type: ElementType, allocation_len: u32, @@ -342,7 +340,7 @@ fn get_element( let data = execute_scsi_command(sg_raw, &cmd, "read element status (B8h)", retry)?; - let page = decode_element_status_page(&inquiry, &data, start_element_address)?; + let page = decode_element_status_page(&data, start_element_address)?; retry = false; // only retry the first command @@ -394,18 +392,18 @@ pub fn read_element_status(file: &mut F) -> Result let mut import_export_slots = Vec::new(); let mut transports = Vec::new(); - let page = get_element(&inquiry, &mut sg_raw, ElementType::Storage, allocation_len, true)?; + let page = get_element(&mut sg_raw, ElementType::Storage, allocation_len, true)?; storage_slots.extend(page.storage_slots); - let page = get_element(&inquiry, &mut sg_raw, ElementType::ImportExport, allocation_len, false)?; + let page = get_element(&mut sg_raw, ElementType::ImportExport, allocation_len, false)?; import_export_slots.extend(page.import_export_slots); - let page = get_element(&inquiry, &mut sg_raw, ElementType::DataTransfer, allocation_len, false)?; + let page = get_element(&mut sg_raw, ElementType::DataTransfer, allocation_len, false)?; drives.extend(page.drives); // get the serial + vendor + model, // some changer require this to be an extra scsi command - let page = get_element(&inquiry, &mut sg_raw, ElementType::DataTransferWithDVCID, allocation_len, false)?; + let page = get_element(&mut sg_raw, ElementType::DataTransferWithDVCID, allocation_len, false)?; // should be in same order and same count, but be on the safe side. // there should not be too many drives normally for drive in drives.iter_mut() { @@ -418,7 +416,7 @@ pub fn read_element_status(file: &mut F) -> Result } } - let page = get_element(&inquiry, &mut sg_raw, ElementType::MediumTransport, allocation_len, false)?; + let page = get_element(&mut sg_raw, ElementType::MediumTransport, allocation_len, false)?; transports.extend(page.transports); let transport_count = setup.transport_element_count as usize; @@ -668,7 +666,6 @@ fn decode_dvcid_info(reader: &mut R) -> Result { } fn decode_element_status_page( - _info: &InquiryInfo, data: &[u8], start_element_address: u16, ) -> Result { -- 2.30.2