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=-5.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_MUTT autolearn=unavailable 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 9F814C43381 for ; Mon, 1 Apr 2019 11:40:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 60B532133D for ; Mon, 1 Apr 2019 11:40:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554118844; bh=LDLVMlUNKStBigWemtht62j/hMd0pxWIk3S+zjMBFiQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=mt97HrZIWzy0ESHr9gOSYX0t1k/ugs3XbE3YCWo1b6qxyoJ7D4fxX66A1XKVAhc1A whv53AAdVhsVa6pucRESMN7zvYTKJyuFSBoSJ9gkRtOhoUHlueMho3rdGGvbwL0ukg yXSPvpL+A8yEaCvRYFc7BIBZJ8QobUgzUBfpTPY0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725895AbfDALkn (ORCPT ); Mon, 1 Apr 2019 07:40:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:37406 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725882AbfDALkn (ORCPT ); Mon, 1 Apr 2019 07:40:43 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A2C0B20880; Mon, 1 Apr 2019 11:40:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554118843; bh=LDLVMlUNKStBigWemtht62j/hMd0pxWIk3S+zjMBFiQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=VMf7ddR/57qNwcZ8gPViQ8TrKrSWtjDFsUhfNALRNSoLtPjV4RAC7C9rhRYwe8Jvc XgBV8/3F7BhlpVBSLRFDRgsz3igJc1axFVTp7FZgKm4H0bUlnsr4rsSx4lT5XMMtHX B37TcqroFP7bXCbYyRJroQ2JseC3axNDJucV40wM= Date: Mon, 1 Apr 2019 13:40:40 +0200 From: Greg Kroah-Hartman To: Gao Xiang Cc: stable@vger.kernel.org, LKML , linux-erofs@lists.ozlabs.org, Chao Yu , Chao Yu , Miao Xie , Fang Wei Subject: Re: [PATCH for-4.19 1/2] staging: erofs: fix error handling when failed to read compresssed data Message-ID: <20190401114040.GC8156@kroah.com> References: <20190401065309.68109-1-gaoxiang25@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190401065309.68109-1-gaoxiang25@huawei.com> User-Agent: Mutt/1.11.4 (2019-03-13) Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Mon, Apr 01, 2019 at 02:53:08PM +0800, Gao Xiang wrote: > commit b6391ac73400eff38377a4a7364bd3df5efb5178 upstream. > > Complete read error handling paths for all three kinds of > compressed pages: > > 1) For cache-managed pages, PG_uptodate will be checked since > read_endio will unlock and SetPageUptodate for these pages; > > 2) For inplaced pages, read_endio cannot SetPageUptodate directly > since it should be used to mark the final decompressed data, > PG_error will be set with page locked for IO error instead; > > 3) For staging pages, PG_error is used, which is similar to > what we do for inplaced pages. > > Fixes: 3883a79abd02 ("staging: erofs: introduce VLE decompression support") > Cc: # 4.19+ > Reviewed-by: Chao Yu > Signed-off-by: Gao Xiang > --- > This series resolves the following conflicts: > FAILED: patch "[PATCH] staging: erofs: fix error handling when failed to read" failed to apply to 4.19-stable tree > FAILED: patch "[PATCH] staging: erofs: keep corrupted fs from crashing kernel in" failed to apply to 4.19-stable tree Thanks for both of these, now queued up. greg k-h