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=-16.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 60D6AC64E7D for ; Sat, 28 Nov 2020 22:10:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 29AAC20706 for ; Sat, 28 Nov 2020 22:10:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="Sh9Kvg4m" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730600AbgK1VuF (ORCPT ); Sat, 28 Nov 2020 16:50:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731248AbgK1SsT (ORCPT ); Sat, 28 Nov 2020 13:48:19 -0500 Received: from casper.infradead.org (casper.infradead.org [IPv6:2001:8b0:10b:1236::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17B49C0254C6; Sat, 28 Nov 2020 08:15:48 -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=+N9nj4aeGcaY7E1cQ0C8G5//2Sxe7PPFKlTYCp379Nc=; b=Sh9Kvg4mkZ4XkPadEWLnVIdZ3T saZLEqTiDzaNBysUYvfcJruhwPbuksCUFc+ke5gwjhVFkndBZ57UQ7fn4y7YpckR8b4ZDwiQukngD 3h/QoUNnAjcd3Kh+WVbHZCWu4czXKsHXG2oNQ/C57Y7zLCfqJvaPsuSEwog3vAo4qKbHYDBeHNS05 j0CdaOXRTKvrHx3+Vjw2wphhy2k7x7Rqdy6fTts7RjMxuXtZEmSClWEQYqBDZpRO+fKBAa4QqDo4M WYpyRFXXAZlz172qFqypLsbK3XlhKzPxNn+C11J542iRyoxaNNArlsXG8/JrIEaIBLhF136iBBo3g l+1fCoyg==; Received: from [2001:4bb8:18c:1dd6:48f3:741a:602e:7fdd] (helo=localhost) by casper.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1kj2sr-0000G4-Tr; Sat, 28 Nov 2020 16:15:38 +0000 From: Christoph Hellwig To: Jens Axboe Cc: Tejun Heo , Josef Bacik , Coly Li , Mike Snitzer , Greg Kroah-Hartman , Jan Kara , Johannes Thumshirn , dm-devel@redhat.com, Jan Kara , linux-block@vger.kernel.org, linux-bcache@vger.kernel.org, linux-mtd@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 16/45] block: switch bdgrab to use igrab Date: Sat, 28 Nov 2020 17:14:41 +0100 Message-Id: <20201128161510.347752-17-hch@lst.de> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201128161510.347752-1-hch@lst.de> References: <20201128161510.347752-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-block@vger.kernel.org All of the current callers already have a reference, but to prepare for additional users ensure bdgrab returns NULL if the block device is beeing freed. Signed-off-by: Christoph Hellwig --- fs/block_dev.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fs/block_dev.c b/fs/block_dev.c index d707ab376da86e..962fabe8a67b83 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -894,10 +894,14 @@ static struct block_device *bdget(dev_t dev) /** * bdgrab -- Grab a reference to an already referenced block device * @bdev: Block device to grab a reference to. + * + * Returns the block_device with an additional reference when successful, + * or NULL if the inode is already beeing freed. */ struct block_device *bdgrab(struct block_device *bdev) { - ihold(bdev->bd_inode); + if (!igrab(bdev->bd_inode)) + return NULL; return bdev; } EXPORT_SYMBOL(bdgrab); -- 2.29.2