From: Jia Zhu <zhujia.zj@bytedance.com> To: linux-erofs@lists.ozlabs.org, xiang@kernel.org, chao@kernel.org Cc: linux-kernel@vger.kernel.org, huyue2@coolpad.com, linux-fsdevel@vger.kernel.org, yinxin.x@bytedance.com Subject: [PATCH V1 4/5] erofs: remove duplicated unregister_cookie Date: Fri, 2 Sep 2022 11:47:47 +0800 [thread overview] Message-ID: <20220902034748.60868-5-zhujia.zj@bytedance.com> (raw) In-Reply-To: <20220902034748.60868-1-zhujia.zj@bytedance.com> In erofs umount scenario, erofs_fscache_unregister_cookie() is called twice in kill_sb() and put_super(). It works for original semantics, cause 'ctx' will be set to NULL in put_super() and will not be unregister again in kill_sb(). However, in shared domain scenario, we use refcount to maintain the lifecycle of cookie. Unregister the cookie twice will cause it to be released early. For the above reasons, this patch removes duplicate unregister_cookie and move fscache_unregister_* before shotdown_super() to prevent busy inode(ctx->inode) when umount. Signed-off-by: Jia Zhu <zhujia.zj@bytedance.com> --- fs/erofs/super.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/fs/erofs/super.c b/fs/erofs/super.c index a3ff87e45f2c..05dc83b25da3 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c @@ -920,19 +920,20 @@ static void erofs_kill_sb(struct super_block *sb) kill_litter_super(sb); return; } - if (erofs_is_fscache_mode(sb)) - generic_shutdown_super(sb); - else - kill_block_super(sb); - sbi = EROFS_SB(sb); if (!sbi) return; + if (erofs_is_fscache_mode(sb)) { + erofs_fscache_unregister_cookie(&sbi->s_fscache); + erofs_fscache_unregister_fs(sb); + generic_shutdown_super(sb); + } else { + kill_block_super(sb); + } + erofs_free_dev_context(sbi->devs); fs_put_dax(sbi->dax_dev, NULL); - erofs_fscache_unregister_cookie(&sbi->s_fscache); - erofs_fscache_unregister_fs(sb); kfree(sbi->opt.fsid); kfree(sbi->opt.domain_id); kfree(sbi); @@ -952,7 +953,6 @@ static void erofs_put_super(struct super_block *sb) iput(sbi->managed_cache); sbi->managed_cache = NULL; #endif - erofs_fscache_unregister_cookie(&sbi->s_fscache); } struct file_system_type erofs_fs_type = { -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Jia Zhu <zhujia.zj@bytedance.com> To: linux-erofs@lists.ozlabs.org, xiang@kernel.org, chao@kernel.org Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, yinxin.x@bytedance.com, jefflexu@linux.alibaba.com, huyue2@coolpad.com, Jia Zhu <zhujia.zj@bytedance.com> Subject: [PATCH V1 4/5] erofs: remove duplicated unregister_cookie Date: Fri, 2 Sep 2022 11:47:47 +0800 [thread overview] Message-ID: <20220902034748.60868-5-zhujia.zj@bytedance.com> (raw) In-Reply-To: <20220902034748.60868-1-zhujia.zj@bytedance.com> In erofs umount scenario, erofs_fscache_unregister_cookie() is called twice in kill_sb() and put_super(). It works for original semantics, cause 'ctx' will be set to NULL in put_super() and will not be unregister again in kill_sb(). However, in shared domain scenario, we use refcount to maintain the lifecycle of cookie. Unregister the cookie twice will cause it to be released early. For the above reasons, this patch removes duplicate unregister_cookie and move fscache_unregister_* before shotdown_super() to prevent busy inode(ctx->inode) when umount. Signed-off-by: Jia Zhu <zhujia.zj@bytedance.com> --- fs/erofs/super.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/fs/erofs/super.c b/fs/erofs/super.c index a3ff87e45f2c..05dc83b25da3 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c @@ -920,19 +920,20 @@ static void erofs_kill_sb(struct super_block *sb) kill_litter_super(sb); return; } - if (erofs_is_fscache_mode(sb)) - generic_shutdown_super(sb); - else - kill_block_super(sb); - sbi = EROFS_SB(sb); if (!sbi) return; + if (erofs_is_fscache_mode(sb)) { + erofs_fscache_unregister_cookie(&sbi->s_fscache); + erofs_fscache_unregister_fs(sb); + generic_shutdown_super(sb); + } else { + kill_block_super(sb); + } + erofs_free_dev_context(sbi->devs); fs_put_dax(sbi->dax_dev, NULL); - erofs_fscache_unregister_cookie(&sbi->s_fscache); - erofs_fscache_unregister_fs(sb); kfree(sbi->opt.fsid); kfree(sbi->opt.domain_id); kfree(sbi); @@ -952,7 +953,6 @@ static void erofs_put_super(struct super_block *sb) iput(sbi->managed_cache); sbi->managed_cache = NULL; #endif - erofs_fscache_unregister_cookie(&sbi->s_fscache); } struct file_system_type erofs_fs_type = { -- 2.20.1
next prev parent reply other threads:[~2022-09-02 3:48 UTC|newest] Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-09-02 3:47 [PATCH V1 0/5] Introduce erofs shared domain Jia Zhu 2022-09-02 3:47 ` Jia Zhu 2022-09-02 3:47 ` [PATCH V1 1/5] erofs: add 'domain_id' mount option for on-demand read sementics Jia Zhu 2022-09-02 3:47 ` Jia Zhu 2022-09-02 3:47 ` [PATCH V1 2/5] erofs: introduce fscache-based domain Jia Zhu 2022-09-02 3:47 ` Jia Zhu 2022-09-02 3:47 ` [PATCH V1 3/5] erofs: add 'domain_id' prefix when register sysfs Jia Zhu 2022-09-02 3:47 ` Jia Zhu 2022-09-02 3:47 ` Jia Zhu [this message] 2022-09-02 3:47 ` [PATCH V1 4/5] erofs: remove duplicated unregister_cookie Jia Zhu 2022-09-02 3:47 ` [PATCH V1 5/5] erofs: support fscache based shared domain Jia Zhu 2022-09-02 3:47 ` Jia Zhu
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220902034748.60868-5-zhujia.zj@bytedance.com \ --to=zhujia.zj@bytedance.com \ --cc=chao@kernel.org \ --cc=huyue2@coolpad.com \ --cc=linux-erofs@lists.ozlabs.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=xiang@kernel.org \ --cc=yinxin.x@bytedance.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.