X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=mm%2Ftiny-shmem.c;h=c7f6e1914bc4e77264591f02958c32f1f8af1d93;hb=97bf2856c6014879bd04983a3e9dfcdac1e7fe85;hp=90abc63db367da5c426dd15ad28c8cd964555466;hpb=a2c21200f1c81b08cb55e417b68150bba439b646;p=linux-2.6.git

diff --git a/mm/tiny-shmem.c b/mm/tiny-shmem.c
index 90abc63db..c7f6e1914 100644
--- a/mm/tiny-shmem.c
+++ b/mm/tiny-shmem.c
@@ -12,7 +12,6 @@
 
 #include <linux/fs.h>
 #include <linux/init.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/vfs.h>
 #include <linux/mount.h>
 #include <linux/file.h>
@@ -31,11 +30,11 @@ static struct vfsmount *shm_mnt;
 
 static int __init init_tmpfs(void)
 {
-	register_filesystem(&tmpfs_fs_type);
-#ifdef CONFIG_TMPFS
-	devfs_mk_dir("shm");
-#endif
+	BUG_ON(register_filesystem(&tmpfs_fs_type) != 0);
+
 	shm_mnt = kern_mount(&tmpfs_fs_type);
+	BUG_ON(IS_ERR(shm_mnt));
+
 	return 0;
 }
 module_init(init_tmpfs)
@@ -78,13 +77,19 @@ struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags)
 		goto close_file;
 
 	d_instantiate(dentry, inode);
-	inode->i_size = size;
 	inode->i_nlink = 0;	/* It is unlinked */
-	file->f_vfsmnt = mntget(shm_mnt);
-	file->f_dentry = dentry;
+
+	file->f_path.mnt = mntget(shm_mnt);
+	file->f_path.dentry = dentry;
 	file->f_mapping = inode->i_mapping;
 	file->f_op = &ramfs_file_operations;
 	file->f_mode = FMODE_WRITE | FMODE_READ;
+
+	/* notify everyone as to the change of file size */
+	error = do_truncate(dentry, size, 0, file);
+	if (error < 0)
+		goto close_file;
+
 	return file;
 
 close_file:
@@ -121,4 +126,23 @@ int shmem_unuse(swp_entry_t entry, struct page *page)
 	return 0;
 }
 
-EXPORT_SYMBOL(shmem_file_setup);
+int shmem_mmap(struct file *file, struct vm_area_struct *vma)
+{
+	file_accessed(file);
+#ifndef CONFIG_MMU
+	return ramfs_nommu_mmap(file, vma);
+#else
+	return 0;
+#endif
+}
+
+#ifndef CONFIG_MMU
+unsigned long shmem_get_unmapped_area(struct file *file,
+				      unsigned long addr,
+				      unsigned long len,
+				      unsigned long pgoff,
+				      unsigned long flags)
+{
+	return ramfs_nommu_get_unmapped_area(file, addr, len, pgoff, flags);
+}
+#endif