diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2010-07-26 11:25:05 +0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2010-10-29 12:16:41 +0400 |
| commit | 71a1c0125f132b2a4656689ca585c5d8931e539c (patch) | |
| tree | 5c33185d3b7b00d1e23e1725b70b5ef14795f5fc /fs/logfs/super.c | |
| parent | d2d1ea93069bd7706206b9c124e438ab2795612c (diff) | |
| download | linux-71a1c0125f132b2a4656689ca585c5d8931e539c.tar.xz | |
logfs get_sb massage, part 1
move allocation of logfs_super to logfs_get_sb, pass it to
logfs_get_sb_...().
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/logfs/super.c')
| -rw-r--r-- | fs/logfs/super.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/fs/logfs/super.c b/fs/logfs/super.c index 5336155c5d81..5e43178add98 100644 --- a/fs/logfs/super.c +++ b/fs/logfs/super.c @@ -536,19 +536,16 @@ static void logfs_kill_sb(struct super_block *sb) log_super("LogFS: Finished unmounting\n"); } -int logfs_get_sb_device(struct file_system_type *type, int flags, +int logfs_get_sb_device(struct logfs_super *super, + struct file_system_type *type, int flags, struct mtd_info *mtd, struct block_device *bdev, const struct logfs_device_ops *devops, struct vfsmount *mnt) { - struct logfs_super *super; struct super_block *sb; int err = -ENOMEM; static int mount_count; log_super("LogFS: Start mount %x\n", mount_count++); - super = kzalloc(sizeof(*super), GFP_KERNEL); - if (!super) - goto err0; super->s_mtd = mtd; super->s_bdev = bdev; @@ -603,20 +600,27 @@ static int logfs_get_sb(struct file_system_type *type, int flags, const char *devname, void *data, struct vfsmount *mnt) { ulong mtdnr; + struct logfs_super *super; + + super = kzalloc(sizeof(*super), GFP_KERNEL); + if (!super) + return -ENOMEM; if (!devname) - return logfs_get_sb_bdev(type, flags, devname, mnt); + return logfs_get_sb_bdev(super, type, flags, devname, mnt); if (strncmp(devname, "mtd", 3)) - return logfs_get_sb_bdev(type, flags, devname, mnt); + return logfs_get_sb_bdev(super, type, flags, devname, mnt); { char *garbage; mtdnr = simple_strtoul(devname+3, &garbage, 0); - if (*garbage) + if (*garbage) { + kfree(super); return -EINVAL; + } } - return logfs_get_sb_mtd(type, flags, mtdnr, mnt); + return logfs_get_sb_mtd(super, type, flags, mtdnr, mnt); } static struct file_system_type logfs_fs_type = { |