From: Christoph Hellwig <hch@lst.de> To: Christian Brauner <brauner@kernel.org>, Al Viro <viro@zeniv.linux.org.uk> Cc: Heiko Carstens <hca@linux.ibm.com>, Vasily Gorbik <gor@linux.ibm.com>, Alexander Gordeev <agordeev@linux.ibm.com>, Fenghua Yu <fenghua.yu@intel.com>, Reinette Chatre <reinette.chatre@intel.com>, Miquel Raynal <miquel.raynal@bootlin.com>, Richard Weinberger <richard@nod.at>, Vignesh Raghavendra <vigneshr@ti.com>, Dennis Dalessandro <dennis.dalessandro@cornelisnetworks.com>, Tejun Heo <tj@kernel.org>, Trond Myklebust <trond.myklebust@hammerspace.com>, Anna Schumaker <anna@kernel.org>, Kees Cook <keescook@chromium.org>, Damien Le Moal <dlemoal@kernel.org>, Naohiro Aota <naohiro.aota@wdc.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, linux-rdma@vger.kernel.org, linux-nfs@vger.kernel.org, linux-hardening@vger.kernel.org, cgroups@vger.kernel.org Subject: [PATCH 14/19] jffs2: convert to ->shutdown_sb and ->free_sb Date: Wed, 13 Sep 2023 08:10:08 -0300 [thread overview] Message-ID: <20230913111013.77623-15-hch@lst.de> (raw) In-Reply-To: <20230913111013.77623-1-hch@lst.de> Convert jffs2 from ->kill_sb to ->shutdown_sb and ->free_sb. Drop the otherwise unused kill_mtd_super helpers, as there is no benefit in it over just calling put_mtd_device on sb->s_mtd. Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/mtd/mtdsuper.c | 12 ------------ fs/jffs2/super.c | 22 ++++++++++++++-------- include/linux/mtd/super.h | 2 -- 3 files changed, 14 insertions(+), 22 deletions(-) diff --git a/drivers/mtd/mtdsuper.c b/drivers/mtd/mtdsuper.c index b7e3763c47f0cd..66da2e6f90f5f5 100644 --- a/drivers/mtd/mtdsuper.c +++ b/drivers/mtd/mtdsuper.c @@ -165,15 +165,3 @@ int get_tree_mtd(struct fs_context *fc, return -EINVAL; } EXPORT_SYMBOL_GPL(get_tree_mtd); - -/* - * destroy an MTD-based superblock - */ -void kill_mtd_super(struct super_block *sb) -{ - generic_shutdown_super(sb); - put_mtd_device(sb->s_mtd); - sb->s_mtd = NULL; -} - -EXPORT_SYMBOL_GPL(kill_mtd_super); diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c index 7ea37f49f1e18e..14577368202e90 100644 --- a/fs/jffs2/super.c +++ b/fs/jffs2/super.c @@ -340,21 +340,27 @@ static void jffs2_put_super (struct super_block *sb) jffs2_dbg(1, "%s(): returning\n", __func__); } -static void jffs2_kill_sb(struct super_block *sb) +static void jffs2_shutdown_sb(struct super_block *sb) { struct jffs2_sb_info *c = JFFS2_SB_INFO(sb); + if (c && !sb_rdonly(sb)) jffs2_stop_garbage_collect_thread(c); - kill_mtd_super(sb); - kfree(c); +} + +static void jffs2_free_sb(struct super_block *sb) +{ + put_mtd_device(sb->s_mtd); + kfree(JFFS2_SB_INFO(sb)); } static struct file_system_type jffs2_fs_type = { - .owner = THIS_MODULE, - .name = "jffs2", - .init_fs_context = jffs2_init_fs_context, - .parameters = jffs2_fs_parameters, - .kill_sb = jffs2_kill_sb, + .owner = THIS_MODULE, + .name = "jffs2", + .init_fs_context = jffs2_init_fs_context, + .parameters = jffs2_fs_parameters, + .shutdown_sb = jffs2_shutdown_sb, + .free_sb = jffs2_free_sb, }; MODULE_ALIAS_FS("jffs2"); diff --git a/include/linux/mtd/super.h b/include/linux/mtd/super.h index 3608a6c36faceb..f6d5c1a17eec23 100644 --- a/include/linux/mtd/super.h +++ b/include/linux/mtd/super.h @@ -17,8 +17,6 @@ extern int get_tree_mtd(struct fs_context *fc, int (*fill_super)(struct super_block *sb, struct fs_context *fc)); -extern void kill_mtd_super(struct super_block *sb); - #endif /* __KERNEL__ */ -- 2.39.2
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org> To: Christian Brauner <brauner-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, Al Viro <viro-RmSDqhL/yNMiFSDQTTA3OLVCufUGDwFn@public.gmane.org> Cc: Heiko Carstens <hca-tEXmvtCZX7AybS5Ee8rs3A@public.gmane.org>, Vasily Gorbik <gor-tEXmvtCZX7AybS5Ee8rs3A@public.gmane.org>, Alexander Gordeev <agordeev-tEXmvtCZX7AybS5Ee8rs3A@public.gmane.org>, Fenghua Yu <fenghua.yu-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>, Reinette Chatre <reinette.chatre-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>, Miquel Raynal <miquel.raynal-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org>, Richard Weinberger <richard-/L3Ra7n9ekc@public.gmane.org>, Vignesh Raghavendra <vigneshr-l0cyMroinI0@public.gmane.org>, Dennis Dalessandro <dennis.dalessandro-ntyVByD3zXaTtA8H5PvdGFaTQe2KTcn/@public.gmane.org>, Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, Trond Myklebust <trond.myklebust-F/q8l9xzQnoyLce1RVWEUA@public.gmane.org>, Anna Schumaker <anna-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, Kees Cook <keescook-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>, Damien Le Moal <dlemoal-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, Naohiro Aota <naohiro.aota-Sjgp3cTcYWE@public.gmane.org>, Greg Kroah-Hartman <gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org>, linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-s390-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Subject: [PATCH 14/19] jffs2: convert to ->shutdown_sb and ->free_sb Date: Wed, 13 Sep 2023 08:10:08 -0300 [thread overview] Message-ID: <20230913111013.77623-15-hch@lst.de> (raw) In-Reply-To: <20230913111013.77623-1-hch-jcswGhMUV9g@public.gmane.org> Convert jffs2 from ->kill_sb to ->shutdown_sb and ->free_sb. Drop the otherwise unused kill_mtd_super helpers, as there is no benefit in it over just calling put_mtd_device on sb->s_mtd. Signed-off-by: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org> --- drivers/mtd/mtdsuper.c | 12 ------------ fs/jffs2/super.c | 22 ++++++++++++++-------- include/linux/mtd/super.h | 2 -- 3 files changed, 14 insertions(+), 22 deletions(-) diff --git a/drivers/mtd/mtdsuper.c b/drivers/mtd/mtdsuper.c index b7e3763c47f0cd..66da2e6f90f5f5 100644 --- a/drivers/mtd/mtdsuper.c +++ b/drivers/mtd/mtdsuper.c @@ -165,15 +165,3 @@ int get_tree_mtd(struct fs_context *fc, return -EINVAL; } EXPORT_SYMBOL_GPL(get_tree_mtd); - -/* - * destroy an MTD-based superblock - */ -void kill_mtd_super(struct super_block *sb) -{ - generic_shutdown_super(sb); - put_mtd_device(sb->s_mtd); - sb->s_mtd = NULL; -} - -EXPORT_SYMBOL_GPL(kill_mtd_super); diff --git a/fs/jffs2/super.c b/fs/jffs2/super.c index 7ea37f49f1e18e..14577368202e90 100644 --- a/fs/jffs2/super.c +++ b/fs/jffs2/super.c @@ -340,21 +340,27 @@ static void jffs2_put_super (struct super_block *sb) jffs2_dbg(1, "%s(): returning\n", __func__); } -static void jffs2_kill_sb(struct super_block *sb) +static void jffs2_shutdown_sb(struct super_block *sb) { struct jffs2_sb_info *c = JFFS2_SB_INFO(sb); + if (c && !sb_rdonly(sb)) jffs2_stop_garbage_collect_thread(c); - kill_mtd_super(sb); - kfree(c); +} + +static void jffs2_free_sb(struct super_block *sb) +{ + put_mtd_device(sb->s_mtd); + kfree(JFFS2_SB_INFO(sb)); } static struct file_system_type jffs2_fs_type = { - .owner = THIS_MODULE, - .name = "jffs2", - .init_fs_context = jffs2_init_fs_context, - .parameters = jffs2_fs_parameters, - .kill_sb = jffs2_kill_sb, + .owner = THIS_MODULE, + .name = "jffs2", + .init_fs_context = jffs2_init_fs_context, + .parameters = jffs2_fs_parameters, + .shutdown_sb = jffs2_shutdown_sb, + .free_sb = jffs2_free_sb, }; MODULE_ALIAS_FS("jffs2"); diff --git a/include/linux/mtd/super.h b/include/linux/mtd/super.h index 3608a6c36faceb..f6d5c1a17eec23 100644 --- a/include/linux/mtd/super.h +++ b/include/linux/mtd/super.h @@ -17,8 +17,6 @@ extern int get_tree_mtd(struct fs_context *fc, int (*fill_super)(struct super_block *sb, struct fs_context *fc)); -extern void kill_mtd_super(struct super_block *sb); - #endif /* __KERNEL__ */ -- 2.39.2
next prev parent reply other threads:[~2023-09-13 11:11 UTC|newest] Thread overview: 106+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-09-13 11:09 split up ->kill_sb Christoph Hellwig 2023-09-13 11:09 ` Christoph Hellwig 2023-09-13 11:09 ` [PATCH 01/19] fs: reflow deactivate_locked_super Christoph Hellwig 2023-09-13 11:09 ` Christoph Hellwig 2023-09-13 16:35 ` Christian Brauner 2023-09-13 16:35 ` Christian Brauner 2023-09-26 9:24 ` Christoph Hellwig 2023-09-26 9:24 ` Christoph Hellwig 2023-09-13 11:09 ` [PATCH 02/19] fs: make ->kill_sb optional Christoph Hellwig 2023-09-13 11:09 ` Christoph Hellwig 2023-09-13 11:09 ` [PATCH 03/19] fs: release anon dev_t in deactivate_locked_super Christoph Hellwig 2023-09-13 11:09 ` Christoph Hellwig 2023-09-13 23:27 ` Al Viro 2023-09-13 23:27 ` Al Viro 2023-09-14 2:37 ` Al Viro 2023-09-14 2:37 ` Al Viro 2023-09-14 5:38 ` Al Viro 2023-09-14 5:38 ` Al Viro 2023-09-14 7:56 ` Christian Brauner 2023-09-14 7:56 ` Christian Brauner 2023-09-26 9:31 ` Christoph Hellwig 2023-09-26 9:31 ` Christoph Hellwig 2023-09-14 14:02 ` Christian Brauner 2023-09-14 14:02 ` Christian Brauner 2023-09-14 16:58 ` Al Viro 2023-09-14 16:58 ` Al Viro 2023-09-14 19:23 ` Al Viro 2023-09-14 19:23 ` Al Viro 2023-09-15 7:40 ` Christian Brauner 2023-09-15 7:40 ` Christian Brauner 2023-09-15 9:44 ` Christian Brauner 2023-09-15 9:44 ` Christian Brauner 2023-09-15 14:12 ` Christian Brauner 2023-09-15 14:12 ` Christian Brauner 2023-09-15 14:28 ` Al Viro 2023-09-15 14:28 ` Al Viro 2023-09-15 14:33 ` Al Viro 2023-09-15 14:33 ` Al Viro 2023-09-15 14:40 ` Christian Brauner 2023-09-15 14:40 ` Christian Brauner 2023-09-26 9:41 ` Christoph Hellwig 2023-09-26 9:41 ` Christoph Hellwig 2023-09-26 9:38 ` Christoph Hellwig 2023-09-26 9:38 ` Christoph Hellwig 2023-09-26 21:25 ` Al Viro 2023-09-27 22:29 ` Al Viro 2023-10-02 6:46 ` Christoph Hellwig 2023-10-09 21:57 ` Al Viro 2023-10-10 8:44 ` Christian Brauner 2023-10-17 19:50 ` Al Viro 2023-09-13 11:09 ` [PATCH 04/19] NFS: remove the s_dev field from struct nfs_server Christoph Hellwig 2023-09-13 11:09 ` Christoph Hellwig 2023-09-13 11:09 ` [PATCH 05/19] fs: assign an anon dev_t in common code Christoph Hellwig 2023-09-13 11:09 ` Christoph Hellwig 2023-09-14 0:34 ` Al Viro 2023-09-14 0:34 ` Al Viro 2023-09-13 11:10 ` [PATCH 06/19] qibfs: use simple_release_fs Christoph Hellwig 2023-09-13 11:10 ` Christoph Hellwig 2023-09-18 11:41 ` Leon Romanovsky 2023-09-18 11:41 ` Leon Romanovsky 2023-09-13 11:10 ` [PATCH 07/19] hypfs: use d_genocide to kill fs entries Christoph Hellwig 2023-09-13 11:10 ` Christoph Hellwig 2023-09-13 11:10 ` [PATCH 08/19] pstore: shrink the pstore_sb_lock critical section in pstore_kill_sb Christoph Hellwig 2023-09-13 11:10 ` Christoph Hellwig 2023-09-13 22:07 ` Kees Cook 2023-09-13 22:07 ` Kees Cook 2023-09-13 11:10 ` [PATCH 09/19] zonefs: remove duplicate cleanup in zonefs_fill_super Christoph Hellwig 2023-09-13 11:10 ` Christoph Hellwig 2023-09-14 0:33 ` Damien Le Moal 2023-09-14 0:33 ` Damien Le Moal 2023-09-14 0:49 ` Al Viro 2023-09-14 0:49 ` Al Viro 2023-09-13 11:10 ` [PATCH 10/19] USB: gadget/legacy: remove sb_mutex Christoph Hellwig 2023-09-13 11:10 ` Christoph Hellwig 2023-09-13 16:10 ` Alan Stern 2023-09-13 16:10 ` Alan Stern 2023-09-26 9:24 ` Christoph Hellwig 2023-09-26 9:24 ` Christoph Hellwig 2023-09-14 10:22 ` Sergey Shtylyov 2023-09-14 10:22 ` Sergey Shtylyov 2023-09-13 11:10 ` [PATCH 11/19] fs: add new shutdown_sb and free_sb methods Christoph Hellwig 2023-09-13 11:10 ` Christoph Hellwig 2023-09-14 2:07 ` Al Viro 2023-09-14 2:07 ` Al Viro 2023-09-13 11:10 ` [PATCH 12/19] fs: convert kill_litter_super to litter_shutdown_sb Christoph Hellwig 2023-09-13 11:10 ` Christoph Hellwig 2023-09-13 22:07 ` Kees Cook 2023-09-13 22:07 ` Kees Cook 2023-09-13 11:10 ` [PATCH 13/19] fs: convert kill_block_super to block_free_sb Christoph Hellwig 2023-09-13 11:10 ` Christoph Hellwig 2023-09-14 2:29 ` Al Viro 2023-09-14 2:29 ` Al Viro 2023-09-13 11:10 ` Christoph Hellwig [this message] 2023-09-13 11:10 ` [PATCH 14/19] jffs2: convert to ->shutdown_sb and ->free_sb Christoph Hellwig 2023-09-13 11:10 ` [PATCH 15/19] kernfs: split ->kill_sb Christoph Hellwig 2023-09-13 11:10 ` Christoph Hellwig 2023-09-18 15:24 ` Michal Koutný 2023-09-18 15:24 ` Michal Koutný 2023-09-13 11:10 ` [PATCH 16/19] x86/resctrl: release rdtgroup_mutex and the CPU hotplug lock in rdt_shutdown_sb Christoph Hellwig 2023-09-13 11:10 ` Christoph Hellwig 2023-09-13 11:10 ` [PATCH 17/19] NFS: move nfs_kill_super to fs_context.c Christoph Hellwig 2023-09-13 11:10 ` Christoph Hellwig 2023-09-13 11:10 ` [PATCH 18/19] fs: simple ->shutdown_sb and ->free_sb conversions Christoph Hellwig 2023-09-13 11:10 ` Christoph Hellwig 2023-09-13 11:10 ` [PATCH 19/19] fs: remove ->kill_sb Christoph Hellwig 2023-09-13 11:10 ` Christoph Hellwig
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=20230913111013.77623-15-hch@lst.de \ --to=hch@lst.de \ --cc=agordeev@linux.ibm.com \ --cc=anna@kernel.org \ --cc=brauner@kernel.org \ --cc=cgroups@vger.kernel.org \ --cc=dennis.dalessandro@cornelisnetworks.com \ --cc=dlemoal@kernel.org \ --cc=fenghua.yu@intel.com \ --cc=gor@linux.ibm.com \ --cc=gregkh@linuxfoundation.org \ --cc=hca@linux.ibm.com \ --cc=keescook@chromium.org \ --cc=linux-hardening@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-nfs@vger.kernel.org \ --cc=linux-rdma@vger.kernel.org \ --cc=linux-s390@vger.kernel.org \ --cc=linux-usb@vger.kernel.org \ --cc=miquel.raynal@bootlin.com \ --cc=naohiro.aota@wdc.com \ --cc=reinette.chatre@intel.com \ --cc=richard@nod.at \ --cc=tj@kernel.org \ --cc=trond.myklebust@hammerspace.com \ --cc=vigneshr@ti.com \ --cc=viro@zeniv.linux.org.uk \ /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.