Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp934957ybt; Wed, 17 Jun 2020 18:20:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzxeP1+fc9poH4pNnJz+TBFZhB0qXnvYxHoDOvSVOnHmbZC8sqUdq7g9dZMXKW7WRVm3HdG X-Received: by 2002:a17:907:4030:: with SMTP id nr24mr1696096ejb.247.1592443216693; Wed, 17 Jun 2020 18:20:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592443216; cv=none; d=google.com; s=arc-20160816; b=VON3tAMwG/z1TbHbKz4qN+h6Fc1Swiq53w0aW1eQM6C8MoQ2XX6uQcthJbs2l4r7ky pLvLLlxn/BX9PYNpLF8GuPvKwmhQZZoZAwM7UgEzNJNpNRsKlqbfRPcBLOBgbDrzt6zX Ria0a7Rej5OIr2QY8Vnbt8eI8QG78JqPbIveB0Gz87yrxVirmE8DUTl0f9ol8mBOhatf ZLrXZCEnPMJhnSiaExXfghlw5FUQXGHTe6+Z9odsqbXvyKq0sLAyFtXa/TTQLgwNlYqc /eiyBdN2zBAlZpjipGtsBlRm4YZzmI+8UrQHZZ8R8rhwM2A8B6W5synwdMoqXAn/Y9k+ Fefw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=h/TUS2yQN6RXmAa4LUH4cziKwjsqZW0S29Hpfb17fo8=; b=fLpyydjnMMNIyaB8KKhtgo/f+zKmdnbuDNFDx3wXSNh4O5VYLxHMjM5rTP+t3wOe1K Xi6bcU+n6PMGK2KgRxa1BLKKD3Ph6Y1fGiQNg1rczaMrtELXahP92f3ioz8xabljBIAf SQSc6Mpfb/OX/7HSaBXolEItlpp54PNU7LZpIkQlX74EdXcgD9RUdTry8/aSqupOquXG afDr4eC3oT49HGkhHuyow0G3rFR96LRtGOx5n9MDRsKl9n4y+wEUmr0bbes6ohqt8Dqi mE91j1ahaLdYPi0O/Uru1CdkSTrw4qegVplPwKcXyHMdP8mfQLiXL54uwseO/Cgbf8Hg 5Ncg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Gx5f45Kt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o19si965476eja.256.2020.06.17.18.19.54; Wed, 17 Jun 2020 18:20:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Gx5f45Kt; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729902AbgFRBSR (ORCPT + 99 others); Wed, 17 Jun 2020 21:18:17 -0400 Received: from mail.kernel.org ([198.145.29.99]:45390 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728803AbgFRBPZ (ORCPT ); Wed, 17 Jun 2020 21:15:25 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 150F221D79; Thu, 18 Jun 2020 01:15:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442924; bh=fxuDxoiJw1A3q7eocOnCf3UTJkQcjntDBa6vgDS/uLs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Gx5f45KtEGYSK8d+8lJCl+AV7KvsOMcDNrQMvmxbHBiHzJlQstg8z+2gsn1P0TEZo UV4zwb9WE68Wojeziz2Nt+GiJ2ZoH+kGu3QiHj0G50gLkIUn9gRmwt9X2dDzzItI9F hSvAaKp+TrtW5JC+nh9kv6gfz+k60mdZ3e+az2jo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chaitanya Kulkarni , Jens Axboe , Sasha Levin , linux-block@vger.kernel.org Subject: [PATCH AUTOSEL 5.7 339/388] blktrace: use errno instead of bi_status Date: Wed, 17 Jun 2020 21:07:16 -0400 Message-Id: <20200618010805.600873-339-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chaitanya Kulkarni [ Upstream commit 48bc3cd3e07a1486f45d9971c75d6090976c3b1b ] In blk_add_trace_spliti() blk_add_trace_bio_remap() use blk_status_to_errno() to pass the error instead of pasing the bi_status. This fixes the sparse warning. Signed-off-by: Chaitanya Kulkarni Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- kernel/trace/blktrace.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index ca39dc3230cb..c6d59a457f50 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c @@ -995,8 +995,10 @@ static void blk_add_trace_split(void *ignore, __blk_add_trace(bt, bio->bi_iter.bi_sector, bio->bi_iter.bi_size, bio_op(bio), bio->bi_opf, - BLK_TA_SPLIT, bio->bi_status, sizeof(rpdu), - &rpdu, blk_trace_bio_get_cgid(q, bio)); + BLK_TA_SPLIT, + blk_status_to_errno(bio->bi_status), + sizeof(rpdu), &rpdu, + blk_trace_bio_get_cgid(q, bio)); } rcu_read_unlock(); } @@ -1033,7 +1035,8 @@ static void blk_add_trace_bio_remap(void *ignore, r.sector_from = cpu_to_be64(from); __blk_add_trace(bt, bio->bi_iter.bi_sector, bio->bi_iter.bi_size, - bio_op(bio), bio->bi_opf, BLK_TA_REMAP, bio->bi_status, + bio_op(bio), bio->bi_opf, BLK_TA_REMAP, + blk_status_to_errno(bio->bi_status), sizeof(r), &r, blk_trace_bio_get_cgid(q, bio)); rcu_read_unlock(); } -- 2.25.1