Merge git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-drm-fsl-dcu.git] / mm / tiny-shmem.c

diff --git a/mm/tiny-shmem.c b/mm/tiny-shmem.c
index b58abcf44ed658e0a44b129a216a16e5cfc6f2d7..c7f6e1914bc4e77264591f02958c32f1f8af1d93 100644 (file)
--- 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>
@@ -33,9 +32,6 @@ static int __init init_tmpfs(void)
 {
        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));
 
@@ -81,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:
@@ -123,3 +125,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