diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2010-07-26 03: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) |
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); | |||
471 | 471 | ||
472 | /* dev_bdev.c */ | 472 | /* dev_bdev.c */ |
473 | #ifdef CONFIG_BLOCK | 473 | #ifdef CONFIG_BLOCK |
474 | int logfs_get_sb_bdev(struct file_system_type *type, int flags, | 474 | int logfs_get_sb_bdev(struct logfs_super *s, |
475 | struct file_system_type *type, int flags, | ||
475 | const char *devname, struct vfsmount *mnt); | 476 | const char *devname, struct vfsmount *mnt); |
476 | #else | 477 | #else |
477 | static inline int logfs_get_sb_bdev(struct file_system_type *type, int flags, | 478 | static inline int logfs_get_sb_bdev(struct logfs_super *s, |
479 | struct file_system_type *type, int flags, | ||
478 | const char *devname, struct vfsmount *mnt) | 480 | const char *devname, struct vfsmount *mnt) |
479 | { | 481 | { |
482 | kfree(s); | ||
480 | return -ENODEV; | 483 | return -ENODEV; |
481 | } | 484 | } |
482 | #endif | 485 | #endif |
483 | 486 | ||
484 | /* dev_mtd.c */ | 487 | /* dev_mtd.c */ |
485 | #ifdef CONFIG_MTD | 488 | #ifdef CONFIG_MTD |
486 | int logfs_get_sb_mtd(struct file_system_type *type, int flags, | 489 | int logfs_get_sb_mtd(struct logfs_super *s, |
490 | struct file_system_type *type, int flags, | ||
487 | int mtdnr, struct vfsmount *mnt); | 491 | int mtdnr, struct vfsmount *mnt); |
488 | #else | 492 | #else |
489 | static inline int logfs_get_sb_mtd(struct file_system_type *type, int flags, | 493 | static inline int logfs_get_sb_mtd(struct logfs_super *s, |
494 | struct file_system_type *type, int flags, | ||
490 | int mtdnr, struct vfsmount *mnt) | 495 | int mtdnr, struct vfsmount *mnt) |
491 | { | 496 | { |
497 | kfree(s); | ||
492 | return -ENODEV; | 498 | return -ENODEV; |
493 | } | 499 | } |
494 | #endif | 500 | #endif |
@@ -619,7 +625,8 @@ void emergency_read_end(struct page *page); | |||
619 | void logfs_crash_dump(struct super_block *sb); | 625 | void logfs_crash_dump(struct super_block *sb); |
620 | void *memchr_inv(const void *s, int c, size_t n); | 626 | void *memchr_inv(const void *s, int c, size_t n); |
621 | int logfs_statfs(struct dentry *dentry, struct kstatfs *stats); | 627 | int logfs_statfs(struct dentry *dentry, struct kstatfs *stats); |
622 | int logfs_get_sb_device(struct file_system_type *type, int flags, | 628 | int logfs_get_sb_device(struct logfs_super *s, |
629 | struct file_system_type *type, int flags, | ||
623 | struct mtd_info *mtd, struct block_device *bdev, | 630 | struct mtd_info *mtd, struct block_device *bdev, |
624 | const struct logfs_device_ops *devops, struct vfsmount *mnt); | 631 | const struct logfs_device_ops *devops, struct vfsmount *mnt); |
625 | int logfs_check_ds(struct logfs_disk_super *ds); | 632 | int logfs_check_ds(struct logfs_disk_super *ds); |