diff options
Diffstat (limited to 'fs/logfs/logfs.h')
-rw-r--r-- | fs/logfs/logfs.h | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/fs/logfs/logfs.h b/fs/logfs/logfs.h index b8786264d243..57afd4a6fabb 100644 --- a/fs/logfs/logfs.h +++ b/fs/logfs/logfs.h | |||
@@ -136,6 +136,7 @@ struct logfs_area_ops { | |||
136 | int (*erase_segment)(struct logfs_area *area); | 136 | int (*erase_segment)(struct logfs_area *area); |
137 | }; | 137 | }; |
138 | 138 | ||
139 | struct logfs_super; /* forward */ | ||
139 | /** | 140 | /** |
140 | * struct logfs_device_ops - device access operations | 141 | * struct logfs_device_ops - device access operations |
141 | * | 142 | * |
@@ -156,7 +157,7 @@ struct logfs_device_ops { | |||
156 | int ensure_write); | 157 | int ensure_write); |
157 | int (*can_write_buf)(struct super_block *sb, u64 ofs); | 158 | int (*can_write_buf)(struct super_block *sb, u64 ofs); |
158 | void (*sync)(struct super_block *sb); | 159 | void (*sync)(struct super_block *sb); |
159 | void (*put_device)(struct super_block *sb); | 160 | void (*put_device)(struct logfs_super *s); |
160 | }; | 161 | }; |
161 | 162 | ||
162 | /** | 163 | /** |
@@ -471,11 +472,13 @@ void logfs_compr_exit(void); | |||
471 | 472 | ||
472 | /* dev_bdev.c */ | 473 | /* dev_bdev.c */ |
473 | #ifdef CONFIG_BLOCK | 474 | #ifdef CONFIG_BLOCK |
474 | int logfs_get_sb_bdev(struct file_system_type *type, int flags, | 475 | int logfs_get_sb_bdev(struct logfs_super *s, |
475 | const char *devname, struct vfsmount *mnt); | 476 | struct file_system_type *type, |
477 | const char *devname); | ||
476 | #else | 478 | #else |
477 | static inline int logfs_get_sb_bdev(struct file_system_type *type, int flags, | 479 | static inline int logfs_get_sb_bdev(struct logfs_super *s, |
478 | const char *devname, struct vfsmount *mnt) | 480 | struct file_system_type *type, |
481 | const char *devname) | ||
479 | { | 482 | { |
480 | return -ENODEV; | 483 | return -ENODEV; |
481 | } | 484 | } |
@@ -483,11 +486,9 @@ static inline int logfs_get_sb_bdev(struct file_system_type *type, int flags, | |||
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, int mtdnr); |
487 | int mtdnr, struct vfsmount *mnt); | ||
488 | #else | 490 | #else |
489 | static inline int logfs_get_sb_mtd(struct file_system_type *type, int flags, | 491 | static inline int logfs_get_sb_mtd(struct logfs_super *s, int mtdnr) |
490 | int mtdnr, struct vfsmount *mnt) | ||
491 | { | 492 | { |
492 | return -ENODEV; | 493 | return -ENODEV; |
493 | } | 494 | } |
@@ -619,9 +620,6 @@ void emergency_read_end(struct page *page); | |||
619 | void logfs_crash_dump(struct super_block *sb); | 620 | void logfs_crash_dump(struct super_block *sb); |
620 | void *memchr_inv(const void *s, int c, size_t n); | 621 | void *memchr_inv(const void *s, int c, size_t n); |
621 | int logfs_statfs(struct dentry *dentry, struct kstatfs *stats); | 622 | int logfs_statfs(struct dentry *dentry, struct kstatfs *stats); |
622 | int logfs_get_sb_device(struct file_system_type *type, int flags, | ||
623 | struct mtd_info *mtd, struct block_device *bdev, | ||
624 | const struct logfs_device_ops *devops, struct vfsmount *mnt); | ||
625 | int logfs_check_ds(struct logfs_disk_super *ds); | 623 | int logfs_check_ds(struct logfs_disk_super *ds); |
626 | int logfs_write_sb(struct super_block *sb); | 624 | int logfs_write_sb(struct super_block *sb); |
627 | 625 | ||