linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 V2 4/5] erofs: remove duplicated unregister_cookie
Date: Fri,  2 Sep 2022 18:53:04 +0800	[thread overview]
Message-ID: <20220902105305.79687-5-zhujia.zj@bytedance.com> (raw)
In-Reply-To: <20220902105305.79687-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 69de1731f454..667a78f0ee70 100644
--- a/fs/erofs/super.c
+++ b/fs/erofs/super.c
@@ -919,19 +919,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);
@@ -951,7 +952,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


  parent reply	other threads:[~2022-09-02 10:54 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-02 10:53 [PATCH V2 0/5] Introduce erofs shared domain Jia Zhu
2022-09-02 10:53 ` [PATCH V2 1/5] erofs: add 'domain_id' mount option for on-demand read sementics Jia Zhu
2022-09-02 10:53 ` [PATCH V2 2/5] erofs: introduce fscache-based domain Jia Zhu
2022-09-09  8:42   ` JeffleXu
2022-09-13  4:31     ` [External] " Jia Zhu
2022-09-13  6:34       ` JeffleXu
2022-09-14  3:02   ` JeffleXu
2022-09-14  3:15     ` [External] " Jia Zhu
2022-09-02 10:53 ` [PATCH V2 3/5] erofs: add 'domain_id' prefix when register sysfs Jia Zhu
2022-09-09  9:23   ` JeffleXu
2022-09-09  9:26     ` JeffleXu
2022-09-13  4:35       ` [External] " Jia Zhu
2022-09-02 10:53 ` Jia Zhu [this message]
2022-09-09  9:55   ` [PATCH V2 4/5] erofs: remove duplicated unregister_cookie JeffleXu
2022-09-09 10:28     ` JeffleXu
2022-09-13  4:52       ` [External] " Jia Zhu
2022-09-13  4:37     ` Jia Zhu
2022-09-02 10:53 ` [PATCH V2 5/5] erofs: support fscache based shared domain Jia Zhu
2022-09-13  6:27   ` JeffleXu
2022-09-13 12:59     ` [External] " Jia Zhu
2022-09-08  6:49 ` [PATCH V2 0/5] Introduce erofs " 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=20220902105305.79687-5-zhujia.zj@bytedance.com \
    --to=zhujia.zj@bytedance.com \
    --cc=chao@kernel.org \
    --cc=huyue2@coolpad.com \
    --cc=jefflexu@linux.alibaba.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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).