Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / mm / tiny-shmem.c

diff --git a/mm/tiny-shmem.c b/mm/tiny-shmem.c
index c13a216..f9d6a9c 100644 (file)
--- a/mm/tiny-shmem.c
+++ b/mm/tiny-shmem.c
@@ -31,11 +31,14 @@ static struct vfsmount *shm_mnt;
 
 static int __init init_tmpfs(void)
 {
-       register_filesystem(&tmpfs_fs_type);
+       BUG_ON(register_filesystem(&tmpfs_fs_type) != 0);
+
 #ifdef CONFIG_TMPFS
        devfs_mk_dir("shm");
 #endif
        shm_mnt = kern_mount(&tmpfs_fs_type);
+       BUG_ON(IS_ERR(shm_mnt));
+
        return 0;
 }
 module_init(init_tmpfs)
@@ -78,13 +81,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_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:
@@ -120,3 +129,24 @@ int shmem_unuse(swp_entry_t entry, struct page *page)
 {
        return 0;
 }
+
+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