From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51CAEC2B9F4 for ; Mon, 28 Jun 2021 15:17:54 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E4DB861459 for ; Mon, 28 Jun 2021 15:17:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E4DB861459 Authentication-Results: mail.kernel.org; dmarc=fail (p=quarantine dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=tempfail smtp.mailfrom=dm-devel-bounces@redhat.com Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-492-Jn_ccNFZPymVCid04ssf0w-1; Mon, 28 Jun 2021 11:17:51 -0400 X-MC-Unique: Jn_ccNFZPymVCid04ssf0w-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4D3C811279EF; Mon, 28 Jun 2021 15:17:46 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0E3F260843; Mon, 28 Jun 2021 15:17:46 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D737F4E9F5; Mon, 28 Jun 2021 15:17:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 15SFHTjm006247 for ; Mon, 28 Jun 2021 11:17:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id 649AA2022ADD; Mon, 28 Jun 2021 15:17:29 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5CCC5201F44E for ; Mon, 28 Jun 2021 15:17:27 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id ECC759676E8 for ; Mon, 28 Jun 2021 15:17:26 +0000 (UTC) Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-588-AcXElvwRNAGGwvWTcBx6Mw-1; Mon, 28 Jun 2021 11:17:22 -0400 X-MC-Unique: AcXElvwRNAGGwvWTcBx6Mw-1 Received: from imap.suse.de (imap-alt.suse-dmz.suse.de [192.168.254.47]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 547F8202CF; Mon, 28 Jun 2021 15:17:20 +0000 (UTC) Received: from imap3-int (imap-alt.suse-dmz.suse.de [192.168.254.47]) by imap.suse.de (Postfix) with ESMTP id D3D6F11906; Mon, 28 Jun 2021 15:17:19 +0000 (UTC) Received: from director2.suse.de ([192.168.254.72]) by imap3-int with ESMTPSA id GG1NMv/n2WDaJwAALh3uQQ (envelope-from ); Mon, 28 Jun 2021 15:17:19 +0000 From: mwilck@suse.com To: Mike Snitzer , Alasdair G Kergon , Bart Van Assche , "Martin K. Petersen" , linux-scsi@vger.kernel.org, dm-devel@redhat.com, Hannes Reinecke , Christoph Hellwig Date: Mon, 28 Jun 2021 17:15:57 +0200 Message-Id: <20210628151558.2289-3-mwilck@suse.com> In-Reply-To: <20210628151558.2289-1-mwilck@suse.com> References: <20210628151558.2289-1-mwilck@suse.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 15SFHTjm006247 X-loop: dm-devel@redhat.com Cc: Daniel Wagner , emilne@redhat.com, linux-block@vger.kernel.org, nkoenig@redhat.com, Paolo Bonzini , Martin Wilck Subject: [dm-devel] [PATCH v5 2/3] scsi: scsi_ioctl: add sg_io_to_blk_status() X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dm-devel-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit From: Martin Wilck This helper converts the SCSI result in a sg_io_hdr struct to a blk_status_t. It will be used in the SG_IO code path for dm-multipath. Putting it into scsi_ioctl.c avoids open-coding SCSI specific code in the dm layer. Signed-off-by: Martin Wilck --- block/scsi_ioctl.c | 20 ++++++++++++++++++++ include/linux/blkdev.h | 1 + 2 files changed, 21 insertions(+) diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c index 19b63b64ecbc..e061398be90f 100644 --- a/block/scsi_ioctl.c +++ b/block/scsi_ioctl.c @@ -929,6 +929,26 @@ blk_status_t __scsi_result_to_blk_status(int *cmd_result, int result) } EXPORT_SYMBOL(__scsi_result_to_blk_status); +blk_status_t sg_io_to_blk_status(struct sg_io_hdr *hdr) +{ + int result; + blk_status_t sts; + + if (!(hdr->info & SG_INFO_CHECK)) + return BLK_STS_OK; + + result = hdr->status | + (hdr->msg_status << 8) | + (hdr->host_status << 16) | + (hdr->driver_status << 24); + + sts = __scsi_result_to_blk_status(&result, result); + hdr->host_status = host_byte(result); + + return sts; +} +EXPORT_SYMBOL(sg_io_to_blk_status); + static int __init blk_scsi_ioctl_init(void) { blk_set_cmd_filter_defaults(&blk_default_cmd_filter); diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 48497a77428d..5da03edf125c 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -2022,4 +2022,5 @@ int freeze_bdev(struct block_device *bdev); int thaw_bdev(struct block_device *bdev); blk_status_t __scsi_result_to_blk_status(int *cmd_result, int result); +blk_status_t sg_io_to_blk_status(struct sg_io_hdr *hdr); #endif /* _LINUX_BLKDEV_H */ -- 2.32.0 -- dm-devel mailing list dm-devel@redhat.com https://listman.redhat.com/mailman/listinfo/dm-devel