Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp3896685pxb; Tue, 26 Jan 2021 07:26:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJxV3MKnrFPlAnx0xv8ZJQbylKLONKCHgVgvK0tgeFognPYqnWowz8AUcm9qUtQ02pgOu3cT X-Received: by 2002:a05:6402:424a:: with SMTP id g10mr4949871edb.236.1611674772300; Tue, 26 Jan 2021 07:26:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611674772; cv=none; d=google.com; s=arc-20160816; b=p2GEHbpgtr1jt43fkBNt6wkOvBn9YtE7oqnXgPs2ThaGX1UfWxg46lZy5Fkj0iarzC 0esWYA9mxKIRCGMbHuM38jzwP+ZlRS5SAeaw8+VGh76+N5KGnCwQ/wsMPDVdlgE6yCS5 /o1ZYTtsZN8zL5n2H/ncDvb8uQcXxpB81hg2XJMR6dTNV4QJ9Jf8QdwyDQa1JCom/qnZ wTEvIGxE1zb42jHj0FxfI5jqdXC4tqaWBKyvgyTctDBKvFZzPO/aP/im0kPO/F/XN+QF PE5WmQ7SCrRz7lzB3Ey8bEnFefq6IZOcj4fJ3IfOQqjtG8HnH4jF6c+B0wzBLAw/f8bH fDfg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=eRxdbvHrWwCg8ehIKzqaoZWUzsjM/Z9D1y3UwSDV4xY=; b=r4fDWToUgTi/rrg3LPtfbRp0EeHuQE+shd8UNV0OX9JOFGTyjOgS+sZuodaa8j1e+3 U9Fu4SDb6+kZzIak3t9savUkLUXXRnZMFsj6ICkhjXNl3zA8+C7bO6R4jj1jqXu0RoQu +p7yn7CCh+HJbr+vwWe0jsyHtqIlP2VihSlnGpphMeSyzUpECDl+vMkV0GIrrEoXw1Gn qnpRXeEE6zH4dph4Bt2JsBnw8jlEtIyhrGua8OhehLoM/qa94Q+pClvJID7Ci73p9F4i IL8Akezg9Xxu4ys1TtXFeNR+H2HHs16JkOyNzFbWRfiSDuNi9SgftwITDQ/ALjwP48pj ksPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=casper.20170209 header.b=J6ds2suh; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d22si8665073edy.227.2021.01.26.07.25.41; Tue, 26 Jan 2021 07:26:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-nfs-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=@infradead.org header.s=casper.20170209 header.b=J6ds2suh; spf=pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-nfs-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392787AbhAZPYo (ORCPT + 99 others); Tue, 26 Jan 2021 10:24:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392797AbhAZPY0 (ORCPT ); Tue, 26 Jan 2021 10:24:26 -0500 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3777C061A29; Tue, 26 Jan 2021 07:23:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=eRxdbvHrWwCg8ehIKzqaoZWUzsjM/Z9D1y3UwSDV4xY=; b=J6ds2suhWptTFI0URR1OjWJ7nG bFD9DPemPNjvWMkXWcox96rWMxKJ3XW6l1ppx21TRVcFUwpPlv6jvoA7XT9KXgcP6o2uX0j7RoRpv +z2mnPOBw/61en4ioO6qQ6wGDJueVg8AaKJWPDmdZAEUaq4i8ltdczsdeLE2HJcafnbJPknGxvdRx 6NwXe9EcMss4nABThjLiNd3HAoJX9+5JELtc5RkBTpk8I4lDiozmMUqCwxXwNWPeY3eLQi68Xnwox gS5RyvHMHo1HvrS9S/ZtiOeZ/5pCLfhriYZcy0wlYNzlK/z57Bs0TCbgXcPCP6dq83/2TMqyhn6iV oe2pPxoQ==; Received: from [2001:4bb8:191:e347:5918:ac86:61cb:8801] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.94 #2 (Red Hat Linux)) id 1l4Q7U-005oX0-8C; Tue, 26 Jan 2021 15:19:23 +0000 From: Christoph Hellwig To: Jens Axboe , Song Liu Cc: Jaegeuk Kim , Chao Yu , Philipp Reisner , Lars Ellenberg , Coly Li , Mike Snitzer , Josef Bacik , David Sterba , Damien Le Moal , Naohiro Aota , Andrew Morton , Ryusuke Konishi , linux-nilfs@vger.kernel.org, dm-devel@redhat.com, linux-f2fs-devel@lists.sourceforge.net, linux-block@vger.kernel.org, drbd-dev@lists.linbit.com, linux-bcache@vger.kernel.org, linux-raid@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-nfs@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 15/17] nfs/blocklayout: remove cruft in bl_alloc_init_bio Date: Tue, 26 Jan 2021 15:52:45 +0100 Message-Id: <20210126145247.1964410-16-hch@lst.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210126145247.1964410-1-hch@lst.de> References: <20210126145247.1964410-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org. See http://www.infradead.org/rpr.html Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org bio_alloc never returns NULL when it can sleep. Signed-off-by: Christoph Hellwig --- fs/nfs/blocklayout/blocklayout.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c index 3be6836074ae92..1a96ce28efb026 100644 --- a/fs/nfs/blocklayout/blocklayout.c +++ b/fs/nfs/blocklayout/blocklayout.c @@ -123,11 +123,6 @@ bl_alloc_init_bio(int npg, struct block_device *bdev, sector_t disk_sector, npg = min(npg, BIO_MAX_PAGES); bio = bio_alloc(GFP_NOIO, npg); - if (!bio && (current->flags & PF_MEMALLOC)) { - while (!bio && (npg /= 2)) - bio = bio_alloc(GFP_NOIO, npg); - } - if (bio) { bio->bi_iter.bi_sector = disk_sector; bio_set_dev(bio, bdev); -- 2.29.2