| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20190720224955.GD17978@ZenIV.linux.org.uk>
Date: Sat, 20 Jul 2019 23:49:55 +0100
From: Al Viro <viro@...iv.linux.org.uk>
To: Gao Xiang <gaoxiang25@...wei.com>
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Andrew Morton <akpm@...ux-foundation.org>,
Theodore Ts'o <tytso@....edu>,
Linus Torvalds <torvalds@...ux-foundation.org>,
linux-fsdevel@...r.kernel.org, devel@...verdev.osuosl.org,
LKML <linux-kernel@...r.kernel.org>,
linux-erofs@...ts.ozlabs.org, Chao Yu <yuchao0@...wei.com>,
Miao Xie <miaoxie@...wei.com>,
Li Guifu <bluce.liguifu@...wei.com>,
Fang Wei <fangwei1@...wei.com>
Subject: Re: [PATCH v2 03/24] erofs: add super block operations
On Thu, Jul 11, 2019 at 10:57:34PM +0800, Gao Xiang wrote:
> This commit adds erofs super block operations, including (u)mount,
> remount_fs, show_options, statfs, in addition to some private
> icache management functions.
Could you explain what's the point of this
> + /* save the device name to sbi */
> + sbi->dev_name = __getname();
> + if (!sbi->dev_name) {
> + err = -ENOMEM;
> + goto err_devname;
> + }
> +
> + snprintf(sbi->dev_name, PATH_MAX, "%s", dev_name);
> + sbi->dev_name[PATH_MAX - 1] = '\0';
... and this?
> +struct erofs_mount_private {
> + const char *dev_name;
> + char *options;
> +};
> +
> +/* support mount_bdev() with options */
> +static int erofs_fill_super(struct super_block *sb,
> + void *_priv, int silent)
> +{
> + struct erofs_mount_private *priv = _priv;
> +
> + return erofs_read_super(sb, priv->dev_name,
> + priv->options, silent);
> +}
> +
> +static struct dentry *erofs_mount(
> + struct file_system_type *fs_type, int flags,
> + const char *dev_name, void *data)
> +{
> + struct erofs_mount_private priv = {
> + .dev_name = dev_name,
> + .options = data
> + };
> +
> + return mount_bdev(fs_type, flags, dev_name,
> + &priv, erofs_fill_super);
> +}
AFAICS, the only use of sbi->dev_name is debugging printks and
all of those have sb->s_id available, with device name stored
in there. Which makes the whole thing bloody weird - what's
wrong with simply passing data to mount_bdev (instead of
&priv), folding erofs_read_super() into erofs_fill_super(),
replacing sbi->dev_name with sb->s_id and killing sbi->dev_name,
along with the associated allocation, freeing, handling of
allocation failure, etc.?
For drivers/staging location that would be (compile-tested only)
the diff below. I suspect that you could simplify fill_super
a bit further if you added ->kill_sb() along the lines of
sbi = EROFS(sb);
#ifdef EROFS_FS_HAS_MANAGED_CACHE
if (sbi && !sb->s_root)
iput(sbi->managed_cache);
#endif
kill_block_super(sb);
kfree(sbi);
and took freeing sbi out of your ->put_super(). Then fill_super()
would simply return -E... on all failure exits, leaving all cleanup
to ->kill_sb(). E.g. initialization of the same ->managed_cache
would become
#ifdef EROFS_FS_HAS_MANAGED_CACHE
inode = erofs_init_managed_cache(sb);
if (IS_ERR(inode))
return PTR_ERR(inode);
sbi->managed_cache = inode;
#endif
etc. Matter of taste, but IME if destructor parallels the cleanups on failure
exits in constructor it often makes sense to make use of that and kill the
duplication... Anyway, that's a separate store; sbi->dev_name is a lot more
obvious one.
diff --git a/drivers/staging/erofs/internal.h b/drivers/staging/erofs/internal.h
index 382258fc124d..16bab07e69d8 100644
--- a/drivers/staging/erofs/internal.h
+++ b/drivers/staging/erofs/internal.h
@@ -117,8 +117,6 @@ struct erofs_sb_info {
u8 volume_name[16]; /* volume name */
u32 requirements;
- char *dev_name;
-
unsigned int mount_opt;
unsigned int shrinker_run_no;
diff --git a/drivers/staging/erofs/super.c b/drivers/staging/erofs/super.c
index cadbcc11702a..a6ee69d0ce45 100644
--- a/drivers/staging/erofs/super.c
+++ b/drivers/staging/erofs/super.c
@@ -367,15 +367,14 @@ static struct inode *erofs_init_managed_cache(struct super_block *sb)
#endif
-static int erofs_read_super(struct super_block *sb,
- const char *dev_name,
+static int erofs_fill_super(struct super_block *sb,
void *data, int silent)
{
struct inode *inode;
struct erofs_sb_info *sbi;
int err = -EINVAL;
- infoln("read_super, device -> %s", dev_name);
+ infoln("read_super, device -> %s", sb->s_id);
infoln("options -> %s", (char *)data);
if (unlikely(!sb_set_blocksize(sb, EROFS_BLKSIZ))) {
@@ -453,20 +452,10 @@ static int erofs_read_super(struct super_block *sb,
goto err_iget;
}
- /* save the device name to sbi */
- sbi->dev_name = __getname();
- if (!sbi->dev_name) {
- err = -ENOMEM;
- goto err_devname;
- }
-
- snprintf(sbi->dev_name, PATH_MAX, "%s", dev_name);
- sbi->dev_name[PATH_MAX - 1] = '\0';
-
erofs_register_super(sb);
if (!silent)
- infoln("mounted on %s with opts: %s.", dev_name,
+ infoln("mounted on %s with opts: %s.", sb->s_id,
(char *)data);
return 0;
/*
@@ -474,9 +463,6 @@ static int erofs_read_super(struct super_block *sb,
* the following name convention, thus new features
* can be integrated easily without renaming labels.
*/
-err_devname:
- dput(sb->s_root);
- sb->s_root = NULL;
err_iget:
#ifdef EROFS_FS_HAS_MANAGED_CACHE
iput(sbi->managed_cache);
@@ -504,8 +490,7 @@ static void erofs_put_super(struct super_block *sb)
WARN_ON(sb->s_magic != EROFS_SUPER_MAGIC);
- infoln("unmounted for %s", sbi->dev_name);
- __putname(sbi->dev_name);
+ infoln("unmounted for %s", sb->s_id);
#ifdef EROFS_FS_HAS_MANAGED_CACHE
iput(sbi->managed_cache);
@@ -525,33 +510,12 @@ static void erofs_put_super(struct super_block *sb)
sb->s_fs_info = NULL;
}
-
-struct erofs_mount_private {
- const char *dev_name;
- char *options;
-};
-
-/* support mount_bdev() with options */
-static int erofs_fill_super(struct super_block *sb,
- void *_priv, int silent)
-{
- struct erofs_mount_private *priv = _priv;
-
- return erofs_read_super(sb, priv->dev_name,
- priv->options, silent);
-}
-
static struct dentry *erofs_mount(
struct file_system_type *fs_type, int flags,
const char *dev_name, void *data)
{
- struct erofs_mount_private priv = {
- .dev_name = dev_name,
- .options = data
- };
-
return mount_bdev(fs_type, flags, dev_name,
- &priv, erofs_fill_super);
+ data, erofs_fill_super);
}
static void erofs_kill_sb(struct super_block *sb)
Powered by blists - more mailing lists