Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[safe/jmp/linux-2.6] / include / linux / ramfs.h

diff --git a/include/linux/ramfs.h b/include/linux/ramfs.h
index 78ecfa2..e7320b5 100644 (file)
--- a/include/linux/ramfs.h
+++ b/include/linux/ramfs.h
@@ -1,11 +1,13 @@
 #ifndef _LINUX_RAMFS_H
 #define _LINUX_RAMFS_H
 
-struct inode *ramfs_get_inode(struct super_block *sb, int mode, dev_t dev);
-struct super_block *ramfs_get_sb(struct file_system_type *fs_type,
-        int flags, const char *dev_name, void *data);
+struct inode *ramfs_get_inode(struct super_block *sb, const struct inode *dir,
+        int mode, dev_t dev);
+extern int ramfs_get_sb(struct file_system_type *fs_type,
+        int flags, const char *dev_name, void *data, struct vfsmount *mnt);
 
 #ifndef CONFIG_MMU
+extern int ramfs_nommu_expand_for_mapping(struct inode *inode, size_t newsize);
 extern unsigned long ramfs_nommu_get_unmapped_area(struct file *file,
                                                   unsigned long addr,
                                                   unsigned long len,
@@ -16,6 +18,9 @@ extern int ramfs_nommu_mmap(struct file *file, struct vm_area_struct *vma);
 #endif
 
 extern const struct file_operations ramfs_file_operations;
-extern struct vm_operations_struct generic_file_vm_ops;
+extern const struct vm_operations_struct generic_file_vm_ops;
+extern int __init init_rootfs(void);
+
+int ramfs_fill_super(struct super_block *sb, void *data, int silent);
 
 #endif