Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp1914481pxb; Thu, 16 Sep 2021 20:06:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJynaczrlSlrmpWhmXLcz7d9EyiHPkNNZnMWr/+WBf4lzhRLIp4hXHN/mHJohbVaWejPX8WZ X-Received: by 2002:a17:906:7a09:: with SMTP id d9mr9760257ejo.116.1631848013622; Thu, 16 Sep 2021 20:06:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631848013; cv=none; d=google.com; s=arc-20160816; b=TTVPyzcGPdqndot/Up32gVqkkdr8j5sRqf9s/yQoQXxqoA8fEfrZ8Z25M3kFmnqWqq cWh4W8R2Uf9ZFVE7dMc+3OFmeq3koWh24Qk9EtX2DhNwO5YtLMy+1oru9M1iKA5VizLL GSa3s10o4J+7midRdJXTy55IrFJezb4qVZFOc9MKrbg8SAk9ENwpjOTFxUFD7pOV0bhY 7PY5xICA1xFL34mpWSH1oeYOPdV+clcoCAf0M+10Z/cEJlPl9YstdQEtgj0SHuv7HUSS auMEHzNkGssQAQwycLwqnyIZuGfqIHnLxU/eUuFON6YYIdb5IOO2V6NVfRLWa/v+bmLB //xA== 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=gzHqe2tkym3B7UCsSk2DY15Vrl77Vs70X8K5vj8wq6M=; b=Q8+y41Vr/wUtVpCMJ061G9GFfOvlT/Je2XA5cDnQ85RVI1U7DdqiMndYt3vRdn/5Iz 5jheX71ZwW7mFzOCTSCQ/5KydLrfoakgEm9lXlBtoIdAomfrX+gfpw+/xERJKBkGo81s at4gZbZY77yq50cnEdydwlu+911rIGIkfBDeidvDWZSCtMPjawzFpELC67F5XCYx46dK XMWEXQn78Sx+C5XBkAmhvvnrLbkrhwMm9HXHOzhc5QiqHvECwVOWHAIiAaMvlTQ4+gkk vXPxdcOBesYtvr9XF6hSxJ6mMo6KDczucu9EFMYv6wtO5CazL907hAkBUH0A41fpPP1M Solw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="o/sC2YJX"; 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=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y12si5209139edd.393.2021.09.16.20.06.29; Thu, 16 Sep 2021 20:06:53 -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=@linuxfoundation.org header.s=korg header.b="o/sC2YJX"; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352415AbhIPRYY (ORCPT + 99 others); Thu, 16 Sep 2021 13:24:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:39808 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243467AbhIPRP6 (ORCPT ); Thu, 16 Sep 2021 13:15:58 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 0E5AE61B97; Thu, 16 Sep 2021 16:39:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631810390; bh=fpu0kwbRNeA7FwCJ1kfquK8yT26beo2T44htSi7SdpI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o/sC2YJXJCuc+5h1iqfFpXP60MsLqQindvhFu+WKihdBc7dyCUvp+lkg0FjGTPkVi fm+Bf3t7KR6s3J/hpNdQDHcdjvZoiP9wos/sQ+FEGKsdg3VBvB2QHz8YJFNhdngXD7 1aKDEeOiOLngX3xGBQRMBB9TH7CA9B4AbgMo+YGU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chao Yu , Jaegeuk Kim , Sasha Levin Subject: [PATCH 5.14 122/432] f2fs: fix to keep compatibility of fault injection interface Date: Thu, 16 Sep 2021 17:57:51 +0200 Message-Id: <20210916155814.895796699@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210916155810.813340753@linuxfoundation.org> References: <20210916155810.813340753@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chao Yu [ Upstream commit b96d9b3b09f0427b289332c6f6bfbf747a19b654 ] The value of FAULT_* macros and its description in f2fs.rst became inconsistent, fix this to keep compatibility of fault injection interface. Fixes: 67883ade7a98 ("f2fs: remove FAULT_ALLOC_BIO") Signed-off-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Sasha Levin --- Documentation/filesystems/f2fs.rst | 1 + fs/f2fs/f2fs.h | 1 + 2 files changed, 2 insertions(+) diff --git a/Documentation/filesystems/f2fs.rst b/Documentation/filesystems/f2fs.rst index ff9e7cc97c65..b5285599d972 100644 --- a/Documentation/filesystems/f2fs.rst +++ b/Documentation/filesystems/f2fs.rst @@ -185,6 +185,7 @@ fault_type=%d Support configuring fault injection type, should be FAULT_KVMALLOC 0x000000002 FAULT_PAGE_ALLOC 0x000000004 FAULT_PAGE_GET 0x000000008 + FAULT_ALLOC_BIO 0x000000010 (obsolete) FAULT_ALLOC_NID 0x000000020 FAULT_ORPHAN 0x000000040 FAULT_BLOCK 0x000000080 diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index bfcd5ef36907..db95829904e5 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -43,6 +43,7 @@ enum { FAULT_KVMALLOC, FAULT_PAGE_ALLOC, FAULT_PAGE_GET, + FAULT_ALLOC_BIO, /* it's obsolete due to bio_alloc() will never fail */ FAULT_ALLOC_NID, FAULT_ORPHAN, FAULT_BLOCK, -- 2.30.2