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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 3A192C33CAF for ; Thu, 16 Jan 2020 19:03:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 08A642053B for ; Thu, 16 Jan 2020 19:03:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579201424; bh=R7KkKUaYv6rkoyqNNorHo/kp3uI7wYQla8dT74bJabc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=T5k9JuTmLY873uLuLODwDhjyC4c8zykABDhwR+iGxV9+iUBYDnQIOWpSwJTYEl9Xb 3FMf0PDzDMmc1uLdJIx42bXtj5PsY8wWbFgdwwXJzaT4afTINXbrZIugDn9cHwsc7V BGRgDi6f1v/6Z3w/i5HN3nKg6+Y7ojCHK4jFAWAk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407281AbgAPTDm (ORCPT ); Thu, 16 Jan 2020 14:03:42 -0500 Received: from mail.kernel.org ([198.145.29.99]:55336 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388399AbgAPRCb (ORCPT ); Thu, 16 Jan 2020 12:02:31 -0500 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 73F2A2087E; Thu, 16 Jan 2020 17:02:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579194151; bh=R7KkKUaYv6rkoyqNNorHo/kp3uI7wYQla8dT74bJabc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ovFVWcpFfpkftBPgqDyPdZu8s4+lbxR716c9yQtIFf30J1O0DSl39XbKbKj+awEF1 yigYnV47si26zmQ9Ct0G6Z0awhB7zbZat11qHjfUh0S5dAUIMH+K2q7rRgDOOSWsaM /4S1H990YmpRvVc/+kNgiLFtzCmqRu3uyXxT8ok4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ilya Dryomov , Sasha Levin , ceph-devel@vger.kernel.org, linux-block@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 235/671] rbd: clear ->xferred on error from rbd_obj_issue_copyup() Date: Thu, 16 Jan 2020 11:52:24 -0500 Message-Id: <20200116165940.10720-118-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116165940.10720-1-sashal@kernel.org> References: <20200116165940.10720-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: Ilya Dryomov [ Upstream commit 356889c49d84f11f446ec235bd52ca1a7d581aa0 ] Otherwise the assert in rbd_obj_end_request() is triggered. Fixes: 3da691bf4366 ("rbd: new request handling code") Signed-off-by: Ilya Dryomov Signed-off-by: Sasha Levin --- drivers/block/rbd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 585378bc988c..b942f4c8cea8 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -2506,6 +2506,7 @@ static bool rbd_obj_handle_write(struct rbd_obj_request *obj_req) ret = rbd_obj_issue_copyup(obj_req, obj_req->xferred); if (ret) { obj_req->result = ret; + obj_req->xferred = 0; return true; } return false; -- 2.20.1