From nobody Wed Apr 8 10:03:45 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE94CFA3740 for ; Tue, 25 Oct 2022 10:53:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231605AbiJYKxD (ORCPT ); Tue, 25 Oct 2022 06:53:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58984 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232424AbiJYKxA (ORCPT ); Tue, 25 Oct 2022 06:53:00 -0400 Received: from mail.nfschina.com (unknown [124.16.136.209]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 5E7008E790; Tue, 25 Oct 2022 03:52:59 -0700 (PDT) Received: from localhost (unknown [127.0.0.1]) by mail.nfschina.com (Postfix) with ESMTP id 22C051E80C8E; Tue, 25 Oct 2022 18:51:37 +0800 (CST) X-Virus-Scanned: amavisd-new at test.com Received: from mail.nfschina.com ([127.0.0.1]) by localhost (mail.nfschina.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 7u1RwzFhtnfz; Tue, 25 Oct 2022 18:51:34 +0800 (CST) Received: from localhost.localdomain (unknown [219.141.250.2]) (Authenticated sender: zeming@nfschina.com) by mail.nfschina.com (Postfix) with ESMTPA id 43DE61E80C82; Tue, 25 Oct 2022 18:51:34 +0800 (CST) From: Li zeming To: quwenruo.btrfs@gmx.com, clm@fb.com, josef@toxicpanda.com, dsterba@suse.com, linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Li zeming Subject: [PATCH v2] btrfs: volumes: Increase bioc pointer check Date: Tue, 25 Oct 2022 18:52:44 +0800 Message-Id: <20221025105244.5212-1-zeming@nfschina.com> X-Mailer: git-send-email 2.18.2 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This patch has the following changes: 1. Modify "is returned" in the comments to "should be returned". 2. Remove the __GFP_NOFAIL flag from the kzalloc function, which returns NULL if kzalloc fails to allocate memory for bioc. Reviewed-by: Qu Wenruo Signed-off-by: Li zeming --- v2: Add annotation vocabulary modify, remove __GFP_NOFAIL flag. fs/btrfs/volumes.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 064ab2a79c80..b8d901f58995 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -5891,7 +5891,9 @@ static struct btrfs_io_context *alloc_btrfs_io_contex= t(struct btrfs_fs_info *fs_ * and the stripes. */ sizeof(u64) * (total_stripes), - GFP_NOFS|__GFP_NOFAIL); + GFP_NOFS); + if (!bioc) + return NULL; =20 atomic_set(&bioc->error, 0); refcount_set(&bioc->refs, 1); @@ -6071,7 +6073,7 @@ struct btrfs_discard_stripe *btrfs_map_discard(struct= btrfs_fs_info *fs_info, * array of stripes. * For READ, it also needs to be supported using the same mirror number. * - * If the requested block is not left of the left cursor, EIO is returned.= This + * If the requested block is not left of the left cursor, EIO should be re= turned. This * can happen because btrfs_num_copies() returns one more in the dev-repla= ce * case. */ --=20 2.18.2