Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp28070pxb; Tue, 12 Apr 2022 15:52:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz0F0xCblMrDMITi9ZpzxzunVZAp3ApqrhuStDDg8vmBKcoPX+8uQyFrK3OTXUyEpTMJo55 X-Received: by 2002:a63:4707:0:b0:382:207b:889c with SMTP id u7-20020a634707000000b00382207b889cmr32700974pga.541.1649803961847; Tue, 12 Apr 2022 15:52:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649803961; cv=none; d=google.com; s=arc-20160816; b=GoKoztu4G38bmY8R7D+ARt9XD2DGEPqNASi3KqAGMKTUpZa/1IBrKp5k1EpxGcM/SE Mh+s81fD+r7HPqZl1f4YC2vMzmvMQ1cqH23Qe4Y1rms/OCXbWJTvEpC+PzxdSSSB1IcN gfFuIE4STP7Il9d9H6OM2dy2+FzQixYp4VWaxKOMF8V1NHamhbPsrxLU+fbzHlJJOF3p A5Bl5Bri68wdUnlr3C3rSRmnr4301KXArCNPHfiTQRVUzHwlxn7ETbzwIUDgv77bSgXh YNiXVK4VlWx0VFBgRngWntfWAU9VQ8zRxh+wpSsFGKmbSVuMO1ePniS6jrVgEwSRiEmf CG/A== 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=EJ+oDbYAwzXqE6hUKAhITvGx8lxznmCFOwOhUWxcw9Q=; b=fYQpF6B28BYzlCwTlZXVS3D+kW7yJRmAmj2VDMaNNEr6MTZ4V003an5TKVSlf/Vcrl JxeQRssWt75VXeDhyOBchbkdLVDinAuOZ7i2i4ZTyh1wriUfFEd7yL7cqNUZJOwYqzNG gEnDul7+SObrgUe4oVUK6+phNbqxeRgJMcpHtdwy/zS3iIbY859GTqvmbEtoauPWxu9f 3PzVy1p+v6DqFQec7Rrzby8djDlOmHpENUMaoc0k17XpvrQVGs58+1tj+D1ra1EiE7ol /znWUDHizSP5k3t0aNsPmBQ9csqy4MNTq6Q582EsZrgYdPdxXxAslnhLEfDXzzgN3buX BdXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=sM5F4Khb; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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. [23.128.96.19]) by mx.google.com with ESMTPS id q24-20020a656a98000000b0039d79572191si4229892pgu.240.2022.04.12.15.52.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 15:52:41 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=sM5F4Khb; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E28111C7C29; Tue, 12 Apr 2022 14:34:12 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1385277AbiDLIvR (ORCPT + 99 others); Tue, 12 Apr 2022 04:51:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358637AbiDLHmB (ORCPT ); Tue, 12 Apr 2022 03:42:01 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3F04F53704; Tue, 12 Apr 2022 00:18:33 -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 E1A2CB81B66; Tue, 12 Apr 2022 07:18:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 41D6AC385A1; Tue, 12 Apr 2022 07:18:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649747910; bh=osjarx+aiGxIzXmnAxBf/CsL3YFC+xZ9Y+B6Ql7gG4o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sM5F4KhbWPC3JycjozRgsEYjo9Ylh3GvRTGgJH6Xsqqdb0Q0spHw8tQ60sl+uF+Z1 ZHMV3f3RiNn3a3NXTGU7bI7Ke0+PM58U1bYnPJuWlpQdsIVw1kBJ0tbFHkdC+FStW+ QaqcJhcfbWDaupcppEIWbPDA4S1lwO7FpMWFJD9g= 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.17 251/343] scsi: sd: sd_read_cpr() requires VPD pages Date: Tue, 12 Apr 2022 08:31:09 +0200 Message-Id: <20220412062958.571302292@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412062951.095765152@linuxfoundation.org> References: <20220412062951.095765152@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 66056806159a..8b5d2a4076c2 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -3320,6 +3320,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); @@ -3329,7 +3330,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