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=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 890A7C6369E for ; Thu, 19 Nov 2020 15:00:24 +0000 (UTC) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E9804246A5 for ; Thu, 19 Nov 2020 15:00:23 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E9804246A5 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: mail.kernel.org; spf=tempfail smtp.mailfrom=dm-devel-bounces@redhat.com Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-591-AdQrE4CpPnK7ARsFoJOCWQ-1; Thu, 19 Nov 2020 10:00:19 -0500 X-MC-Unique: AdQrE4CpPnK7ARsFoJOCWQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4B22B1005D57; Thu, 19 Nov 2020 15:00:11 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1A8F319D61; Thu, 19 Nov 2020 15:00:10 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id D679D4E58E; Thu, 19 Nov 2020 15:00:07 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 0AJF05Zv015721 for ; Thu, 19 Nov 2020 10:00:06 -0500 Received: by smtp.corp.redhat.com (Postfix) id C573F112D188; Thu, 19 Nov 2020 15:00:05 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast06.extmail.prod.ext.rdu2.redhat.com [10.11.55.22]) by smtp.corp.redhat.com (Postfix) with ESMTPS id BFDB8112D187 for ; Thu, 19 Nov 2020 15:00:00 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 772191875040 for ; Thu, 19 Nov 2020 15:00:00 +0000 (UTC) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-488-fwFgsUDLOUeQxtbmUO1YLQ-1; Thu, 19 Nov 2020 09:59:57 -0500 X-MC-Unique: fwFgsUDLOUeQxtbmUO1YLQ-1 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 681B7ABD6; Thu, 19 Nov 2020 14:59:56 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id 26B541E130B; Thu, 19 Nov 2020 15:59:56 +0100 (CET) Date: Thu, 19 Nov 2020 15:59:56 +0100 From: Jan Kara To: Christoph Hellwig Message-ID: <20201119145956.GA1981@quack2.suse.cz> References: <20201118084800.2339180-1-hch@lst.de> <20201118084800.2339180-19-hch@lst.de> MIME-Version: 1.0 In-Reply-To: <20201118084800.2339180-19-hch@lst.de> User-Agent: Mutt/1.10.1 (2018-07-13) X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: dm-devel@redhat.com Cc: Jens Axboe , Mike Snitzer , Konrad Rzeszutek Wilk , Richard Weinberger , Josef Bacik , Coly Li , linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, dm-devel@redhat.com, linux-mtd@lists.infradead.org, Al Viro , Jan Kara , Tejun Heo , xen-devel@lists.xenproject.org, linux-bcache@vger.kernel.org, linux-mm@kvack.org Subject: Re: [dm-devel] [PATCH 18/20] fs: remove get_super_thawed and get_super_exclusive_thawed X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dm-devel-bounces@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Disposition: inline Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit On Wed 18-11-20 09:47:58, Christoph Hellwig wrote: > Just open code the wait in the only caller of both functions. > > Signed-off-by: Christoph Hellwig As far as I remember, Al (added to CC) generally objected against exporting bits from fs/super.c (like put_super(), __get_super()) in the past. FWIW I also find a dedicated function in fs/super.c somewhat cleaner than opencoding in quota code but I can live with both... Honza > --- > fs/internal.h | 2 ++ > fs/quota/quota.c | 31 +++++++++++++++++++++------- > fs/super.c | 51 ++-------------------------------------------- > include/linux/fs.h | 4 +--- > 4 files changed, 29 insertions(+), 59 deletions(-) > > diff --git a/fs/internal.h b/fs/internal.h > index a7cd0f64faa4ab..47be21dfeebef5 100644 > --- a/fs/internal.h > +++ b/fs/internal.h > @@ -114,7 +114,9 @@ extern struct file *alloc_empty_file_noaccount(int, const struct cred *); > */ > extern int reconfigure_super(struct fs_context *); > extern bool trylock_super(struct super_block *sb); > +struct super_block *__get_super(struct block_device *bdev, bool excl); > extern struct super_block *user_get_super(dev_t); > +void put_super(struct super_block *sb); > extern bool mount_capable(struct fs_context *); > > /* > diff --git a/fs/quota/quota.c b/fs/quota/quota.c > index 9af95c7a0bbe3c..f3d32b0d9008f2 100644 > --- a/fs/quota/quota.c > +++ b/fs/quota/quota.c > @@ -20,6 +20,7 @@ > #include > #include > #include "compat.h" > +#include "../internal.h" > > static int check_quotactl_permission(struct super_block *sb, int type, int cmd, > qid_t id) > @@ -868,6 +869,7 @@ static struct super_block *quotactl_block(const char __user *special, int cmd) > struct block_device *bdev; > struct super_block *sb; > struct filename *tmp = getname(special); > + bool excl = false, thawed = false; > > if (IS_ERR(tmp)) > return ERR_CAST(tmp); > @@ -875,17 +877,32 @@ static struct super_block *quotactl_block(const char __user *special, int cmd) > putname(tmp); > if (IS_ERR(bdev)) > return ERR_CAST(bdev); > - if (quotactl_cmd_onoff(cmd)) > - sb = get_super_exclusive_thawed(bdev); > - else if (quotactl_cmd_write(cmd)) > - sb = get_super_thawed(bdev); > - else > - sb = get_super(bdev); > + > + if (quotactl_cmd_onoff(cmd)) { > + excl = true; > + thawed = true; > + } else if (quotactl_cmd_write(cmd)) { > + thawed = true; > + } > + > +retry: > + sb = __get_super(bdev, excl); > + if (thawed && sb && sb->s_writers.frozen != SB_UNFROZEN) { > + if (excl) > + up_write(&sb->s_umount); > + else > + up_read(&sb->s_umount); > + wait_event(sb->s_writers.wait_unfrozen, > + sb->s_writers.frozen == SB_UNFROZEN); > + put_super(sb); > + goto retry; > + } > + > bdput(bdev); > if (!sb) > return ERR_PTR(-ENODEV); > - > return sb; > + > #else > return ERR_PTR(-ENODEV); > #endif > diff --git a/fs/super.c b/fs/super.c > index 98bb0629ee108e..343e5c1e538d2a 100644 > --- a/fs/super.c > +++ b/fs/super.c > @@ -307,7 +307,7 @@ static void __put_super(struct super_block *s) > * Drops a temporary reference, frees superblock if there's no > * references left. > */ > -static void put_super(struct super_block *sb) > +void put_super(struct super_block *sb) > { > spin_lock(&sb_lock); > __put_super(sb); > @@ -740,7 +740,7 @@ void iterate_supers_type(struct file_system_type *type, > > EXPORT_SYMBOL(iterate_supers_type); > > -static struct super_block *__get_super(struct block_device *bdev, bool excl) > +struct super_block *__get_super(struct block_device *bdev, bool excl) > { > struct super_block *sb; > > @@ -789,53 +789,6 @@ struct super_block *get_super(struct block_device *bdev) > } > EXPORT_SYMBOL(get_super); > > -static struct super_block *__get_super_thawed(struct block_device *bdev, > - bool excl) > -{ > - while (1) { > - struct super_block *s = __get_super(bdev, excl); > - if (!s || s->s_writers.frozen == SB_UNFROZEN) > - return s; > - if (!excl) > - up_read(&s->s_umount); > - else > - up_write(&s->s_umount); > - wait_event(s->s_writers.wait_unfrozen, > - s->s_writers.frozen == SB_UNFROZEN); > - put_super(s); > - } > -} > - > -/** > - * get_super_thawed - get thawed superblock of a device > - * @bdev: device to get the superblock for > - * > - * Scans the superblock list and finds the superblock of the file system > - * mounted on the device. The superblock is returned once it is thawed > - * (or immediately if it was not frozen). %NULL is returned if no match > - * is found. > - */ > -struct super_block *get_super_thawed(struct block_device *bdev) > -{ > - return __get_super_thawed(bdev, false); > -} > -EXPORT_SYMBOL(get_super_thawed); > - > -/** > - * get_super_exclusive_thawed - get thawed superblock of a device > - * @bdev: device to get the superblock for > - * > - * Scans the superblock list and finds the superblock of the file system > - * mounted on the device. The superblock is returned once it is thawed > - * (or immediately if it was not frozen) and s_umount semaphore is held > - * in exclusive mode. %NULL is returned if no match is found. > - */ > -struct super_block *get_super_exclusive_thawed(struct block_device *bdev) > -{ > - return __get_super_thawed(bdev, true); > -} > -EXPORT_SYMBOL(get_super_exclusive_thawed); > - > /** > * get_active_super - get an active reference to the superblock of a device > * @bdev: device to get the superblock for > diff --git a/include/linux/fs.h b/include/linux/fs.h > index 8667d0cdc71e76..a61df0dd4f1989 100644 > --- a/include/linux/fs.h > +++ b/include/linux/fs.h > @@ -1409,7 +1409,7 @@ enum { > > struct sb_writers { > int frozen; /* Is sb frozen? */ > - wait_queue_head_t wait_unfrozen; /* for get_super_thawed() */ > + wait_queue_head_t wait_unfrozen; /* wait for thaw */ > struct percpu_rw_semaphore rw_sem[SB_FREEZE_LEVELS]; > }; > > @@ -3132,8 +3132,6 @@ extern struct file_system_type *get_filesystem(struct file_system_type *fs); > extern void put_filesystem(struct file_system_type *fs); > extern struct file_system_type *get_fs_type(const char *name); > extern struct super_block *get_super(struct block_device *); > -extern struct super_block *get_super_thawed(struct block_device *); > -extern struct super_block *get_super_exclusive_thawed(struct block_device *bdev); > extern struct super_block *get_active_super(struct block_device *bdev); > extern void drop_super(struct super_block *sb); > extern void drop_super_exclusive(struct super_block *sb); > -- > 2.29.2 > -- Jan Kara SUSE Labs, CR -- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel 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=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 DAA77C6379D for ; Thu, 19 Nov 2020 15:00:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8E54B246EB for ; Thu, 19 Nov 2020 15:00:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728193AbgKSO76 (ORCPT ); Thu, 19 Nov 2020 09:59:58 -0500 Received: from mx2.suse.de ([195.135.220.15]:60724 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726641AbgKSO76 (ORCPT ); Thu, 19 Nov 2020 09:59:58 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 681B7ABD6; Thu, 19 Nov 2020 14:59:56 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id 26B541E130B; Thu, 19 Nov 2020 15:59:56 +0100 (CET) Date: Thu, 19 Nov 2020 15:59:56 +0100 From: Jan Kara To: Christoph Hellwig Cc: Jens Axboe , Tejun Heo , Josef Bacik , Konrad Rzeszutek Wilk , Coly Li , Mike Snitzer , dm-devel@redhat.com, Richard Weinberger , Jan Kara , linux-block@vger.kernel.org, xen-devel@lists.xenproject.org, linux-bcache@vger.kernel.org, linux-mtd@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, Al Viro Subject: Re: [PATCH 18/20] fs: remove get_super_thawed and get_super_exclusive_thawed Message-ID: <20201119145956.GA1981@quack2.suse.cz> References: <20201118084800.2339180-1-hch@lst.de> <20201118084800.2339180-19-hch@lst.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201118084800.2339180-19-hch@lst.de> User-Agent: Mutt/1.10.1 (2018-07-13) Precedence: bulk List-ID: X-Mailing-List: linux-bcache@vger.kernel.org On Wed 18-11-20 09:47:58, Christoph Hellwig wrote: > Just open code the wait in the only caller of both functions. > > Signed-off-by: Christoph Hellwig As far as I remember, Al (added to CC) generally objected against exporting bits from fs/super.c (like put_super(), __get_super()) in the past. FWIW I also find a dedicated function in fs/super.c somewhat cleaner than opencoding in quota code but I can live with both... Honza > --- > fs/internal.h | 2 ++ > fs/quota/quota.c | 31 +++++++++++++++++++++------- > fs/super.c | 51 ++-------------------------------------------- > include/linux/fs.h | 4 +--- > 4 files changed, 29 insertions(+), 59 deletions(-) > > diff --git a/fs/internal.h b/fs/internal.h > index a7cd0f64faa4ab..47be21dfeebef5 100644 > --- a/fs/internal.h > +++ b/fs/internal.h > @@ -114,7 +114,9 @@ extern struct file *alloc_empty_file_noaccount(int, const struct cred *); > */ > extern int reconfigure_super(struct fs_context *); > extern bool trylock_super(struct super_block *sb); > +struct super_block *__get_super(struct block_device *bdev, bool excl); > extern struct super_block *user_get_super(dev_t); > +void put_super(struct super_block *sb); > extern bool mount_capable(struct fs_context *); > > /* > diff --git a/fs/quota/quota.c b/fs/quota/quota.c > index 9af95c7a0bbe3c..f3d32b0d9008f2 100644 > --- a/fs/quota/quota.c > +++ b/fs/quota/quota.c > @@ -20,6 +20,7 @@ > #include > #include > #include "compat.h" > +#include "../internal.h" > > static int check_quotactl_permission(struct super_block *sb, int type, int cmd, > qid_t id) > @@ -868,6 +869,7 @@ static struct super_block *quotactl_block(const char __user *special, int cmd) > struct block_device *bdev; > struct super_block *sb; > struct filename *tmp = getname(special); > + bool excl = false, thawed = false; > > if (IS_ERR(tmp)) > return ERR_CAST(tmp); > @@ -875,17 +877,32 @@ static struct super_block *quotactl_block(const char __user *special, int cmd) > putname(tmp); > if (IS_ERR(bdev)) > return ERR_CAST(bdev); > - if (quotactl_cmd_onoff(cmd)) > - sb = get_super_exclusive_thawed(bdev); > - else if (quotactl_cmd_write(cmd)) > - sb = get_super_thawed(bdev); > - else > - sb = get_super(bdev); > + > + if (quotactl_cmd_onoff(cmd)) { > + excl = true; > + thawed = true; > + } else if (quotactl_cmd_write(cmd)) { > + thawed = true; > + } > + > +retry: > + sb = __get_super(bdev, excl); > + if (thawed && sb && sb->s_writers.frozen != SB_UNFROZEN) { > + if (excl) > + up_write(&sb->s_umount); > + else > + up_read(&sb->s_umount); > + wait_event(sb->s_writers.wait_unfrozen, > + sb->s_writers.frozen == SB_UNFROZEN); > + put_super(sb); > + goto retry; > + } > + > bdput(bdev); > if (!sb) > return ERR_PTR(-ENODEV); > - > return sb; > + > #else > return ERR_PTR(-ENODEV); > #endif > diff --git a/fs/super.c b/fs/super.c > index 98bb0629ee108e..343e5c1e538d2a 100644 > --- a/fs/super.c > +++ b/fs/super.c > @@ -307,7 +307,7 @@ static void __put_super(struct super_block *s) > * Drops a temporary reference, frees superblock if there's no > * references left. > */ > -static void put_super(struct super_block *sb) > +void put_super(struct super_block *sb) > { > spin_lock(&sb_lock); > __put_super(sb); > @@ -740,7 +740,7 @@ void iterate_supers_type(struct file_system_type *type, > > EXPORT_SYMBOL(iterate_supers_type); > > -static struct super_block *__get_super(struct block_device *bdev, bool excl) > +struct super_block *__get_super(struct block_device *bdev, bool excl) > { > struct super_block *sb; > > @@ -789,53 +789,6 @@ struct super_block *get_super(struct block_device *bdev) > } > EXPORT_SYMBOL(get_super); > > -static struct super_block *__get_super_thawed(struct block_device *bdev, > - bool excl) > -{ > - while (1) { > - struct super_block *s = __get_super(bdev, excl); > - if (!s || s->s_writers.frozen == SB_UNFROZEN) > - return s; > - if (!excl) > - up_read(&s->s_umount); > - else > - up_write(&s->s_umount); > - wait_event(s->s_writers.wait_unfrozen, > - s->s_writers.frozen == SB_UNFROZEN); > - put_super(s); > - } > -} > - > -/** > - * get_super_thawed - get thawed superblock of a device > - * @bdev: device to get the superblock for > - * > - * Scans the superblock list and finds the superblock of the file system > - * mounted on the device. The superblock is returned once it is thawed > - * (or immediately if it was not frozen). %NULL is returned if no match > - * is found. > - */ > -struct super_block *get_super_thawed(struct block_device *bdev) > -{ > - return __get_super_thawed(bdev, false); > -} > -EXPORT_SYMBOL(get_super_thawed); > - > -/** > - * get_super_exclusive_thawed - get thawed superblock of a device > - * @bdev: device to get the superblock for > - * > - * Scans the superblock list and finds the superblock of the file system > - * mounted on the device. The superblock is returned once it is thawed > - * (or immediately if it was not frozen) and s_umount semaphore is held > - * in exclusive mode. %NULL is returned if no match is found. > - */ > -struct super_block *get_super_exclusive_thawed(struct block_device *bdev) > -{ > - return __get_super_thawed(bdev, true); > -} > -EXPORT_SYMBOL(get_super_exclusive_thawed); > - > /** > * get_active_super - get an active reference to the superblock of a device > * @bdev: device to get the superblock for > diff --git a/include/linux/fs.h b/include/linux/fs.h > index 8667d0cdc71e76..a61df0dd4f1989 100644 > --- a/include/linux/fs.h > +++ b/include/linux/fs.h > @@ -1409,7 +1409,7 @@ enum { > > struct sb_writers { > int frozen; /* Is sb frozen? */ > - wait_queue_head_t wait_unfrozen; /* for get_super_thawed() */ > + wait_queue_head_t wait_unfrozen; /* wait for thaw */ > struct percpu_rw_semaphore rw_sem[SB_FREEZE_LEVELS]; > }; > > @@ -3132,8 +3132,6 @@ extern struct file_system_type *get_filesystem(struct file_system_type *fs); > extern void put_filesystem(struct file_system_type *fs); > extern struct file_system_type *get_fs_type(const char *name); > extern struct super_block *get_super(struct block_device *); > -extern struct super_block *get_super_thawed(struct block_device *); > -extern struct super_block *get_super_exclusive_thawed(struct block_device *bdev); > extern struct super_block *get_active_super(struct block_device *bdev); > extern void drop_super(struct super_block *sb); > extern void drop_super_exclusive(struct super_block *sb); > -- > 2.29.2 > -- Jan Kara SUSE Labs, CR 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=-15.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, 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_SANE_1 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 F2EBBC63697 for ; Thu, 19 Nov 2020 15:00:37 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8120E246A5 for ; Thu, 19 Nov 2020 15:00:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="1cd11IdI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8120E246A5 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mtd-bounces+linux-mtd=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Difq9fr3QJLu9u0BjH7mLsv81ooP0sqqiwOtBVes63w=; b=1cd11IdIJ1/5L1p7dMdPdLSVJ Q59DOk0JW/TL0d2dhZ2iUHWBW5Eo3V+lpDFfGlmasoByOMZExWmCV9gccM3mZ0Om4fWgj4As8Zd85 YkNb5qO1GxCMhNCAQCaygb8bLpMeB9Qo8kkwtDEicv90nKAigvtfGdyqI2DK9pfoeKGKxhloNxNPo nGsaW29CnL3XzYafz88T+N5kmru2SWZXLXY6MEzMdgsi0nq9pp3xDxqV33MnqT6btdboVOvv72nwq x2B5yywii3fyo+HHpN6OUR1Oqxf2eoSwFSPyc8/fGz8CV3auAtgvTbNOESPZSI3/LJjb4EAOO7QHm tHTpf077w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kflPk-0007zu-KQ; Thu, 19 Nov 2020 15:00:00 +0000 Received: from mx2.suse.de ([195.135.220.15]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kflPh-0007yQ-KY for linux-mtd@lists.infradead.org; Thu, 19 Nov 2020 14:59:58 +0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 681B7ABD6; Thu, 19 Nov 2020 14:59:56 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id 26B541E130B; Thu, 19 Nov 2020 15:59:56 +0100 (CET) Date: Thu, 19 Nov 2020 15:59:56 +0100 From: Jan Kara To: Christoph Hellwig Subject: Re: [PATCH 18/20] fs: remove get_super_thawed and get_super_exclusive_thawed Message-ID: <20201119145956.GA1981@quack2.suse.cz> References: <20201118084800.2339180-1-hch@lst.de> <20201118084800.2339180-19-hch@lst.de> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201118084800.2339180-19-hch@lst.de> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201119_095957_922637_301C404E X-CRM114-Status: GOOD ( 30.23 ) X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jens Axboe , Mike Snitzer , Konrad Rzeszutek Wilk , Richard Weinberger , Josef Bacik , Coly Li , linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, dm-devel@redhat.com, linux-mtd@lists.infradead.org, Al Viro , Jan Kara , Tejun Heo , xen-devel@lists.xenproject.org, linux-bcache@vger.kernel.org, linux-mm@kvack.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-mtd" Errors-To: linux-mtd-bounces+linux-mtd=archiver.kernel.org@lists.infradead.org On Wed 18-11-20 09:47:58, Christoph Hellwig wrote: > Just open code the wait in the only caller of both functions. > > Signed-off-by: Christoph Hellwig As far as I remember, Al (added to CC) generally objected against exporting bits from fs/super.c (like put_super(), __get_super()) in the past. FWIW I also find a dedicated function in fs/super.c somewhat cleaner than opencoding in quota code but I can live with both... Honza > --- > fs/internal.h | 2 ++ > fs/quota/quota.c | 31 +++++++++++++++++++++------- > fs/super.c | 51 ++-------------------------------------------- > include/linux/fs.h | 4 +--- > 4 files changed, 29 insertions(+), 59 deletions(-) > > diff --git a/fs/internal.h b/fs/internal.h > index a7cd0f64faa4ab..47be21dfeebef5 100644 > --- a/fs/internal.h > +++ b/fs/internal.h > @@ -114,7 +114,9 @@ extern struct file *alloc_empty_file_noaccount(int, const struct cred *); > */ > extern int reconfigure_super(struct fs_context *); > extern bool trylock_super(struct super_block *sb); > +struct super_block *__get_super(struct block_device *bdev, bool excl); > extern struct super_block *user_get_super(dev_t); > +void put_super(struct super_block *sb); > extern bool mount_capable(struct fs_context *); > > /* > diff --git a/fs/quota/quota.c b/fs/quota/quota.c > index 9af95c7a0bbe3c..f3d32b0d9008f2 100644 > --- a/fs/quota/quota.c > +++ b/fs/quota/quota.c > @@ -20,6 +20,7 @@ > #include > #include > #include "compat.h" > +#include "../internal.h" > > static int check_quotactl_permission(struct super_block *sb, int type, int cmd, > qid_t id) > @@ -868,6 +869,7 @@ static struct super_block *quotactl_block(const char __user *special, int cmd) > struct block_device *bdev; > struct super_block *sb; > struct filename *tmp = getname(special); > + bool excl = false, thawed = false; > > if (IS_ERR(tmp)) > return ERR_CAST(tmp); > @@ -875,17 +877,32 @@ static struct super_block *quotactl_block(const char __user *special, int cmd) > putname(tmp); > if (IS_ERR(bdev)) > return ERR_CAST(bdev); > - if (quotactl_cmd_onoff(cmd)) > - sb = get_super_exclusive_thawed(bdev); > - else if (quotactl_cmd_write(cmd)) > - sb = get_super_thawed(bdev); > - else > - sb = get_super(bdev); > + > + if (quotactl_cmd_onoff(cmd)) { > + excl = true; > + thawed = true; > + } else if (quotactl_cmd_write(cmd)) { > + thawed = true; > + } > + > +retry: > + sb = __get_super(bdev, excl); > + if (thawed && sb && sb->s_writers.frozen != SB_UNFROZEN) { > + if (excl) > + up_write(&sb->s_umount); > + else > + up_read(&sb->s_umount); > + wait_event(sb->s_writers.wait_unfrozen, > + sb->s_writers.frozen == SB_UNFROZEN); > + put_super(sb); > + goto retry; > + } > + > bdput(bdev); > if (!sb) > return ERR_PTR(-ENODEV); > - > return sb; > + > #else > return ERR_PTR(-ENODEV); > #endif > diff --git a/fs/super.c b/fs/super.c > index 98bb0629ee108e..343e5c1e538d2a 100644 > --- a/fs/super.c > +++ b/fs/super.c > @@ -307,7 +307,7 @@ static void __put_super(struct super_block *s) > * Drops a temporary reference, frees superblock if there's no > * references left. > */ > -static void put_super(struct super_block *sb) > +void put_super(struct super_block *sb) > { > spin_lock(&sb_lock); > __put_super(sb); > @@ -740,7 +740,7 @@ void iterate_supers_type(struct file_system_type *type, > > EXPORT_SYMBOL(iterate_supers_type); > > -static struct super_block *__get_super(struct block_device *bdev, bool excl) > +struct super_block *__get_super(struct block_device *bdev, bool excl) > { > struct super_block *sb; > > @@ -789,53 +789,6 @@ struct super_block *get_super(struct block_device *bdev) > } > EXPORT_SYMBOL(get_super); > > -static struct super_block *__get_super_thawed(struct block_device *bdev, > - bool excl) > -{ > - while (1) { > - struct super_block *s = __get_super(bdev, excl); > - if (!s || s->s_writers.frozen == SB_UNFROZEN) > - return s; > - if (!excl) > - up_read(&s->s_umount); > - else > - up_write(&s->s_umount); > - wait_event(s->s_writers.wait_unfrozen, > - s->s_writers.frozen == SB_UNFROZEN); > - put_super(s); > - } > -} > - > -/** > - * get_super_thawed - get thawed superblock of a device > - * @bdev: device to get the superblock for > - * > - * Scans the superblock list and finds the superblock of the file system > - * mounted on the device. The superblock is returned once it is thawed > - * (or immediately if it was not frozen). %NULL is returned if no match > - * is found. > - */ > -struct super_block *get_super_thawed(struct block_device *bdev) > -{ > - return __get_super_thawed(bdev, false); > -} > -EXPORT_SYMBOL(get_super_thawed); > - > -/** > - * get_super_exclusive_thawed - get thawed superblock of a device > - * @bdev: device to get the superblock for > - * > - * Scans the superblock list and finds the superblock of the file system > - * mounted on the device. The superblock is returned once it is thawed > - * (or immediately if it was not frozen) and s_umount semaphore is held > - * in exclusive mode. %NULL is returned if no match is found. > - */ > -struct super_block *get_super_exclusive_thawed(struct block_device *bdev) > -{ > - return __get_super_thawed(bdev, true); > -} > -EXPORT_SYMBOL(get_super_exclusive_thawed); > - > /** > * get_active_super - get an active reference to the superblock of a device > * @bdev: device to get the superblock for > diff --git a/include/linux/fs.h b/include/linux/fs.h > index 8667d0cdc71e76..a61df0dd4f1989 100644 > --- a/include/linux/fs.h > +++ b/include/linux/fs.h > @@ -1409,7 +1409,7 @@ enum { > > struct sb_writers { > int frozen; /* Is sb frozen? */ > - wait_queue_head_t wait_unfrozen; /* for get_super_thawed() */ > + wait_queue_head_t wait_unfrozen; /* wait for thaw */ > struct percpu_rw_semaphore rw_sem[SB_FREEZE_LEVELS]; > }; > > @@ -3132,8 +3132,6 @@ extern struct file_system_type *get_filesystem(struct file_system_type *fs); > extern void put_filesystem(struct file_system_type *fs); > extern struct file_system_type *get_fs_type(const char *name); > extern struct super_block *get_super(struct block_device *); > -extern struct super_block *get_super_thawed(struct block_device *); > -extern struct super_block *get_super_exclusive_thawed(struct block_device *bdev); > extern struct super_block *get_active_super(struct block_device *bdev); > extern void drop_super(struct super_block *sb); > extern void drop_super_exclusive(struct super_block *sb); > -- > 2.29.2 > -- Jan Kara SUSE Labs, CR ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/