Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp818691pxb; Tue, 12 Apr 2022 14:18:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzbO/aj6pnf9k/uefo4Tdtcp3d/N74Y6jSGLTBpmd3x+Q5n6NtiOdXKY3wuVMG1sdy0Y6JC X-Received: by 2002:a17:90a:4882:b0:1c5:f4e2:989a with SMTP id b2-20020a17090a488200b001c5f4e2989amr7171275pjh.160.1649798335814; Tue, 12 Apr 2022 14:18:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649798335; cv=none; d=google.com; s=arc-20160816; b=AkMET7oKmFADWgx3/od+9DtGOwrRygClsQU8xSSXNXl4zIPefO5gGYIDLhYb/EJ0mN Z6eEl22dM50tM9QtrvQ5t1x0TA1AHN6PESQv9lueVPPURYCSci4xBvCAMAO3yAa20UKz uJfs46SVaHHxJwiwb1QQ+YJm5wvXKEQoku5dhY2iRnlcS0z4mlCsC/HgDmew/Cl9eWaa qQbNnIdFFINcqE9+dy1gd7P+8AuFQAUDDOB/OMN+IcooGz5pmUuSvNIQrdGPKtdYopD8 1M5LTObclnY8IWr2JgoBq12Mg3zYYXQ63h0QB+3MlPfvIi/Bfuthw/M4t5It7toXa3sL WBjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=EBkc+derD7vQ4eGdY5/9Ya4xTmoKZLmQGoyR6gUxx6E=; b=MbkaU5IqSzMnhJFE0R4Ffb5ZyibYK0+DIjhQp4uXEJ6SnUATJCfZjWBxd+6nqxZr41 l0pyJicHi5gaeulzPprrAtP4VEkv9M9g9ME/zBPt5axfU2E25Pw8P/1PV1Xp96mR+Ol3 YNpiuc/EdLn3nNn1+haVdIPw+OIokb0wKOFf/sbIy4tRCM/IwbksAExB9Bkh/60zm9eK 15uUuRv0Ekcv9Wn3uELnbLK2Jahjq39QyWh8XhIoUApIBPUP5IeUVXy0W5LLXvuo+Oxh M+XaQxEY+E/LDfnbwqPrF0QuO33dGYDFEX5vOcURa3bbFNMQ4xVWuX6C3yYaUkpUadzn B8kQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=IIqGiPVc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id h9-20020a056a00218900b005056456ed1fsi12915222pfi.221.2022.04.12.14.18.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 14:18:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=IIqGiPVc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 134D1FCBCE; Tue, 12 Apr 2022 13:32:35 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353508AbiDLIDx (ORCPT + 99 others); Tue, 12 Apr 2022 04:03:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353659AbiDLHZv (ORCPT ); Tue, 12 Apr 2022 03:25:51 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CEE2B2654A; Tue, 12 Apr 2022 00:03:25 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 82DE2B81A8F; Tue, 12 Apr 2022 07:03:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EB030C385A6; Tue, 12 Apr 2022 07:03:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649747003; bh=kt8bCl6zviwQmwvSHDOF7FP52x9dCspdhUw6+zS4QsE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IIqGiPVc/VIGZW9Vm5WSD7O3Wovbp7QV+CEMJxXfR/H86E7FmqyAxqiJy6FzEJeKx f6NCGO+S+LUyZt3H9ZbyzrellvMmPd1F6jn+XcAj7mrd3a+V1TAsiJmLDwxXQoO/cL njhKMDjq6tInMdd799xt/GKdQEIikec3DkEeiaug= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Damien Le Moal , Christoph Hellwig , Damien Le Moal , Bart Van Assche , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 5.16 201/285] scsi: sd: sd_read_cpr() requires VPD pages Date: Tue, 12 Apr 2022 08:30:58 +0200 Message-Id: <20220412062949.461893466@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412062943.670770901@linuxfoundation.org> References: <20220412062943.670770901@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Martin K. Petersen [ Upstream commit 1700714b1ff252b634db21186db4d91e7e006043 ] As such it should be called inside the scsi_device_supports_vpd() conditional. Link: https://lore.kernel.org/r/20220302053559.32147-13-martin.petersen@oracle.com Fixes: e815d36548f0 ("scsi: sd: add concurrent positioning ranges support") Cc: Damien Le Moal Reviewed-by: Christoph Hellwig Reviewed-by: Damien Le Moal Reviewed-by: Bart Van Assche Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/sd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index dfca484dd0c4..95f4788619ed 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -3321,6 +3321,7 @@ static int sd_revalidate_disk(struct gendisk *disk) sd_read_block_limits(sdkp); sd_read_block_characteristics(sdkp); sd_zbc_read_zones(sdkp, buffer); + sd_read_cpr(sdkp); } sd_print_capacity(sdkp, old_capacity); @@ -3330,7 +3331,6 @@ static int sd_revalidate_disk(struct gendisk *disk) sd_read_app_tag_own(sdkp, buffer); sd_read_write_same(sdkp, buffer); sd_read_security(sdkp, buffer); - sd_read_cpr(sdkp); } /* -- 2.35.1