From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753367AbbDFNte (ORCPT ); Mon, 6 Apr 2015 09:49:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58274 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753179AbbDFNtc (ORCPT ); Mon, 6 Apr 2015 09:49:32 -0400 Date: Mon, 6 Apr 2015 09:48:43 -0400 From: Jarod Wilson To: Ming Lei Cc: Christoph Hellwig , Jens Axboe , Linux Kernel Mailing List , Tejun Heo , Andrew Morton , Alexander Viro , David Herrmann , Markus Pargmann , "nbd-general@lists.sourceforge.net" , Stefan Haberland , Sebastian Ott , Fabian Frederick , linux-s390@vger.kernel.org Subject: Re: [PATCH 1/6] block: export blkdev_reread_part() Message-ID: <20150406134843.GF14217@redhat.com> References: <1428218688-4092-1-git-send-email-ming.lei@canonical.com> <1428218688-4092-2-git-send-email-ming.lei@canonical.com> <20150405161241.GB16886@infradead.org> <20150406134227.GC14217@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150406134227.GC14217@redhat.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Apr 06, 2015 at 09:42:27AM -0400, Jarod Wilson wrote: > On Mon, Apr 06, 2015 at 12:40:12AM +0800, Ming Lei wrote: > > On Mon, Apr 6, 2015 at 12:12 AM, Christoph Hellwig wrote: > > >> +/* > > >> + * This is exported as API for block driver, can be called > > >> + * with requiring bd_mutex or not. > > >> + */ > > >> +int __blkdev_reread_part(struct block_device *bdev, bool lock) > > >> { > > >> struct gendisk *disk = bdev->bd_disk; > > >> int res; > > >> @@ -159,12 +163,14 @@ static int blkdev_reread_part(struct block_device *bdev) > > >> return -EINVAL; > > >> if (!capable(CAP_SYS_ADMIN)) > > >> return -EACCES; > > >> - if (!mutex_trylock(&bdev->bd_mutex)) > > >> + if (lock && !mutex_trylock(&bdev->bd_mutex)) > > >> return -EBUSY; > > > > > > Please don't add funtions that do conditional locking, instead move > > > all the code into blkdev_reread_part_nolock, and then wrap it: > > > > > > int blkdev_reread_part(struct block_device *bdev) > > > { > > > if (!mutex_trylock(&bdev->bd_mutex)) > > > return -EBUSY; > > > blkdev_reread_part_nolock(bdev); > > > mutex_unlock(&bdev->bd_mutex); > > > } > > > > Yes, it is more clean, but with extra acquiring lock cost for the > > failure cases, especially when we replace trylock with mutex_lock(). > > I was working on a version of this myself over the past few days, I > actually removed blkdev_reread_part() entirely, renamed > fs/partition-generic.c::reread_partitions() to __reread_partitions(), then Sorry, that was block/partition-generic.c, not fs/. -- Jarod Wilson jarod@redhat.com