From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-3269524-1523477273-2-3986887440834594642 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, MAILING_LIST_MULTI -1, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1523477272; b=L/+Z1txDO+G55bUwl32HvsWuKaAWeqQeIb8qQc+g+Yrxcgvjmr aumPhz0Hz3CJZQDuiCrDpI1neqtqlxpPzM176nEQE7mayFDz3BrhTmcK5xRv665+ vlbHcenEjCIsYuLCWR0HG5QJR6IF03sKSm8lXGQwDykfyXW5R4KhpEGGQ/jVtuKW GnadJP6F02yv+upYdjkWpxatdag4TVPyP7GhUjS4Lm18vhHHGKA65N/qZLskxej5 R7/MUJPKsAksDK/kHIMm60JEoCgj8dBdJBH/0eOyssseqt2YGlwhSbgGGjm6qKe6 b7Vq0v8wJq+uYtkSKU7fkj/56xLohGsXoOvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=fm2; t=1523477272; bh=dUf6N8gxJ7XXnLGgUTWwCzg/vYMrLV 8ZsCrztvqlwWg=; b=tigEWHyhSLpEQDng5l6FIaMm4zOdWAo2uGW7wNbexNwCUf 6gu0XxSbf31d/fV13nYaCe0DBaa9K56pe6qb1wr7jxO2pe64zhSsTkNiXghP5IRt E1j7LDfIuk5zJymYse8u531HOiCzwXWeNUgoytyTLEcbdLU08PKq4rjTzv6Cnzj/ bS/+6fhLtfUAtl9la7T6PQNKGzLfP/3ZBT0VQLEHaU9bcT/AtkQAKtojUQiFNUW3 U5DCRLK34jyZJBMm0CSc5Er6uN6YNbNiev9FyBGUDaiJBmXuh8EQeWsgrepb8kOI /kNSlEgbPkhyvXgQs8bB2b6e9MSZ1WbOEWSj46Dw== ARC-Authentication-Results: i=1; mx1.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx1.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfH1agNsYesgHiaoB6rd1flPFXR1oFWZXt3hMR7tHlQbnBSuS1UDDEBAbL60yf1+AFqZeOXf20BtlG1x4RXZCaX4+HwDOn+4mYLPpr78LU83vDCqNX95B DQaqzMt01eiz/NgnfNSZ3QjRa6USe4w46dlyASEbMvdc72lBwQYVRvuxLwRO3eCLc+Ujcg8Fri06o0ZMJRaph3hwOOotKAS7CKa2IOW7RVGjMwJGZ83vNhyQ X-CM-Analysis: v=2.3 cv=WaUilXpX c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=IkcTkHD0fZMA:10 a=Kd1tUaAdevIA:10 a=DfNHnWVPAAAA:8 a=yPCof4ZbAAAA:8 a=iox4zFpeAAAA:8 a=yMhMjlubAAAA:8 a=ag1SF4gXAAAA:8 a=as_2-ZBmz6qe2MDftmcA:9 a=QEXdDO2ut3YA:10 a=rjTVMONInIDnV1a_A2c_:22 a=WzC6qhA0u3u7Ye7llzcV:22 a=Yupwre4RP9_Eg_Bd0iYG:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756352AbeDKUHg (ORCPT ); Wed, 11 Apr 2018 16:07:36 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:34862 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933632AbeDKSzD (ORCPT ); Wed, 11 Apr 2018 14:55:03 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Colin Ian King , Liu Bo , David Sterba , Sasha Levin Subject: [PATCH 4.9 058/310] btrfs: fix incorrect error return ret being passed to mapping_set_error Date: Wed, 11 Apr 2018 20:33:17 +0200 Message-Id: <20180411183624.731165201@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180411183622.305902791@linuxfoundation.org> References: <20180411183622.305902791@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Colin Ian King [ Upstream commit bff5baf8aa37a97293725a16c03f49872249c07e ] The setting of return code ret should be based on the error code passed into function end_extent_writepage and not on ret. Thanks to Liu Bo for spotting this mistake in the original fix I submitted. Detected by CoverityScan, CID#1414312 ("Logically dead code") Fixes: 5dca6eea91653e ("Btrfs: mark mapping with error flag to report errors to userspace") Signed-off-by: Colin Ian King Reviewed-by: Liu Bo Signed-off-by: David Sterba Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/extent_io.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -2453,7 +2453,7 @@ void end_extent_writepage(struct page *p if (!uptodate) { ClearPageUptodate(page); SetPageError(page); - ret = ret < 0 ? ret : -EIO; + ret = err < 0 ? err : -EIO; mapping_set_error(page->mapping, ret); } }