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 04:16:41 -0400 |
commit | 71a1c0125f132b2a4656689ca585c5d8931e539c (patch) | |
tree | 5c33185d3b7b00d1e23e1725b70b5ef14795f5fc /fs/logfs/logfs.h | |
parent | d2d1ea93069bd7706206b9c124e438ab2795612c (diff) | |
download | linux-stable-71a1c0125f132b2a4656689ca585c5d8931e539c.tar.gz linux-stable-71a1c0125f132b2a4656689ca585c5d8931e539c.tar.bz2 linux-stable-71a1c0125f132b2a4656689ca585c5d8931e539c.zip |
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/logfs.h')
-rw-r--r-- | fs/logfs/logfs.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/fs/logfs/logfs.h b/fs/logfs/logfs.h index b8786264d243..a3f0aba9e526 100644 --- a/fs/logfs/logfs.h +++ b/fs/logfs/logfs.h @@ -471,24 +471,30 @@ void logfs_compr_exit(void); /* dev_bdev.c */ #ifdef CONFIG_BLOCK -int logfs_get_sb_bdev(struct file_system_type *type, int flags, +int logfs_get_sb_bdev(struct logfs_super *s, + struct file_system_type *type, int flags, const char *devname, struct vfsmount *mnt); #else -static inline int logfs_get_sb_bdev(struct file_system_type *type, int flags, +static inline int logfs_get_sb_bdev(struct logfs_super *s, + struct file_system_type *type, int flags, const char *devname, struct vfsmount *mnt) { + kfree(s); return -ENODEV; } #endif /* dev_mtd.c */ #ifdef CONFIG_MTD -int logfs_get_sb_mtd(struct file_system_type *type, int flags, +int logfs_get_sb_mtd(struct logfs_super *s, + struct file_system_type *type, int flags, int mtdnr, struct vfsmount *mnt); #else -static inline int logfs_get_sb_mtd(struct file_system_type *type, int flags, +static inline int logfs_get_sb_mtd(struct logfs_super *s, + struct file_system_type *type, int flags, int mtdnr, struct vfsmount *mnt) { + kfree(s); return -ENODEV; } #endif @@ -619,7 +625,8 @@ void emergency_read_end(struct page *page); void logfs_crash_dump(struct super_block *sb); void *memchr_inv(const void *s, int c, size_t n); int logfs_statfs(struct dentry *dentry, struct kstatfs *stats); -int logfs_get_sb_device(struct file_system_type *type, int flags, +int logfs_get_sb_device(struct logfs_super *s, + struct file_system_type *type, int flags, struct mtd_info *mtd, struct block_device *bdev, const struct logfs_device_ops *devops, struct vfsmount *mnt); int logfs_check_ds(struct logfs_disk_super *ds); |