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=-9.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 C131CC433E0 for ; Sat, 20 Jun 2020 07:13:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 980C323600 for ; Sat, 20 Jun 2020 07:13:09 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="e2Swv7dL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726951AbgFTHNJ (ORCPT ); Sat, 20 Jun 2020 03:13:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725826AbgFTHNI (ORCPT ); Sat, 20 Jun 2020 03:13:08 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 97501C06174E; Sat, 20 Jun 2020 00:13:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=CfONlCRjhO73FEJM/WnVlbCNj8YwlebODnTmK/qAM28=; b=e2Swv7dLWvXRlk0EHxa64o2Kkh S5v14RCvcHEGoijs4S7d1FiFLlHWjBoA0VAsRZk6o38HrJ8wZFJVaU/+87DUn991u7oeE+4jb2t/n 1n1HQ1wbnikuSLUCYyFnB+JV6dpxlB7TBafk/lDUe3jDAoVsZu8E0W49zE19JY94vz6HhzycFe5x4 /09sWovtueZ5QR1EeYishahcwXFLChbcfUH1ZInPsGyO+SjCWns4gXIU+g8l6F2HLW5MvyrVZeY+E /DKoWOs6X+DBjuTtlJ2K/BtMvo8chqnKUGR9554u6DIxWDtVHRK/hFy9CGTs7TtQpQMwcZIzJRRNH g8f8FPiA==; Received: from 195-192-102-148.dyn.cablelink.at ([195.192.102.148] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1jmXgZ-000196-Vm; Sat, 20 Jun 2020 07:13:08 +0000 From: Christoph Hellwig To: martin.petersen@oracle.com Cc: linux-scsi@vger.kernel.org, linux-ide@vger.kernel.org Subject: [PATCH] libata: fix the ata_scsi_dma_need_drain stub Date: Sat, 20 Jun 2020 09:13:02 +0200 Message-Id: <20200620071302.462974-2-hch@lst.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200620071302.462974-1-hch@lst.de> References: <20200620071302.462974-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org We don't only need the stub when libata is disable, but also if it is modular and there are built-in SAS drivers (which can happen when SCSI_SAS_ATA is disabled). Fixes: b8f1d1e05817 ("scsi: Wire up ata_scsi_dma_need_drain for SAS HBA drivers") Signed-off-by: Christoph Hellwig --- include/linux/libata.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/libata.h b/include/linux/libata.h index 042e584daca73e..c57bf674968114 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -1092,7 +1092,7 @@ extern int ata_scsi_ioctl(struct scsi_device *dev, unsigned int cmd, #define ATA_SCSI_COMPAT_IOCTL /* empty */ #endif extern int ata_scsi_queuecmd(struct Scsi_Host *h, struct scsi_cmnd *cmd); -#if IS_ENABLED(CONFIG_ATA) +#if IS_REACHABLE(CONFIG_ATA) bool ata_scsi_dma_need_drain(struct request *rq); #else #define ata_scsi_dma_need_drain NULL -- 2.26.2