8 files changed, 47 insertions, 37 deletions

diff --git a/mm/cleancache.c b/mm/cleancache.c
index 32e6f4136fa2..d76ba74be2d0 100644
--- a/mm/cleancache.c
+++ b/mm/cleancache.c
@@ -89,7 +89,7 @@ static int cleancache_get_key(struct inode *inode,
                 fhfn = sb->s_export_op->encode_fh;
                 if  (fhfn) {
                         len = (*fhfn)(inode, &key->u.fh[0], &maxlen, NULL);
-                        if (len <= 0 || len == 255)
+                        if (len <= FILEID_ROOT || len == FILEID_INVALID)
                                 return -1;
                         if (maxlen > CLEANCACHE_KEY_MAX)
                                 return -1;
diff --git a/mm/fadvise.c b/mm/fadvise.c
index 909ec558625c..7e092689a12a 100644
--- a/mm/fadvise.c
+++ b/mm/fadvise.c
@@ -39,7 +39,7 @@ SYSCALL_DEFINE(fadvise64_64)(int fd, loff_t offset, loff_t len, int advice)
         if (!f.file)
                 return -EBADF;
 
-        if (S_ISFIFO(f.file->f_path.dentry->d_inode->i_mode)) {
+        if (S_ISFIFO(file_inode(f.file)->i_mode)) {
                 ret = -ESPIPE;
                 goto out;
         }
diff --git a/mm/filemap.c b/mm/filemap.c
index c610076c30e1..e1979fdca805 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1711,7 +1711,7 @@ EXPORT_SYMBOL(filemap_fault);
 int filemap_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
         struct page *page = vmf->page;
-        struct inode *inode = vma->vm_file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(vma->vm_file);
         int ret = VM_FAULT_LOCKED;
 
         sb_start_pagefault(inode->i_sb);
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index cdb64e4d238a..0a0be33bb199 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -127,7 +127,7 @@ static inline struct hugepage_subpool *subpool_inode(struct inode *inode)
 
 static inline struct hugepage_subpool *subpool_vma(struct vm_area_struct *vma)
 {
-        return subpool_inode(vma->vm_file->f_dentry->d_inode);
+        return subpool_inode(file_inode(vma->vm_file));
 }
 
 /*
@@ -2479,7 +2479,7 @@ static int unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
         address = address & huge_page_mask(h);
         pgoff = ((address - vma->vm_start) >> PAGE_SHIFT) +
                         vma->vm_pgoff;
-        mapping = vma->vm_file->f_dentry->d_inode->i_mapping;
+        mapping = file_inode(vma->vm_file)->i_mapping;
 
         /*
          * Take the mapping lock for the duration of the table walk. As
diff --git a/mm/mmap.c b/mm/mmap.c
index 318e121affda..37a1fcac029d 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -203,7 +203,7 @@ static void __remove_shared_vm_struct(struct vm_area_struct *vma,
                 struct file *file, struct address_space *mapping)
 {
         if (vma->vm_flags & VM_DENYWRITE)
-                atomic_inc(&file->f_path.dentry->d_inode->i_writecount);
+                atomic_inc(&file_inode(file)->i_writecount);
         if (vma->vm_flags & VM_SHARED)
                 mapping->i_mmap_writable--;
 
@@ -576,7 +576,7 @@ static void __vma_link_file(struct vm_area_struct *vma)
                 struct address_space *mapping = file->f_mapping;
 
                 if (vma->vm_flags & VM_DENYWRITE)
-                        atomic_dec(&file->f_path.dentry->d_inode->i_writecount);
+                        atomic_dec(&file_inode(file)->i_writecount);
                 if (vma->vm_flags & VM_SHARED)
                         mapping->i_mmap_writable++;
 
@@ -1229,7 +1229,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
                         return -EAGAIN;
         }
 
-        inode = file ? file->f_path.dentry->d_inode : NULL;
+        inode = file ? file_inode(file) : NULL;
 
         if (file) {
                 switch (flags & MAP_TYPE) {
@@ -1431,7 +1431,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
         int error;
         struct rb_node **rb_link, *rb_parent;
         unsigned long charged = 0;
-        struct inode *inode =  file ? file->f_path.dentry->d_inode : NULL;
+        struct inode *inode =  file ? file_inode(file) : NULL;
 
         /* Clear old maps */
         error = -ENOMEM;
diff --git a/mm/nommu.c b/mm/nommu.c
index da0d210fd403..e19328087534 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -943,7 +943,7 @@ static int validate_mmap_request(struct file *file,
                  */
                 mapping = file->f_mapping;
                 if (!mapping)
-                        mapping = file->f_path.dentry->d_inode->i_mapping;
+                        mapping = file_inode(file)->i_mapping;
 
                 capabilities = 0;
                 if (mapping && mapping->backing_dev_info)
@@ -952,7 +952,7 @@ static int validate_mmap_request(struct file *file,
                 if (!capabilities) {
                         /* no explicit capabilities set, so assume some
                          * defaults */
-                        switch (file->f_path.dentry->d_inode->i_mode & S_IFMT) {
+                        switch (file_inode(file)->i_mode & S_IFMT) {
                         case S_IFREG:
                         case S_IFBLK:
                                 capabilities = BDI_CAP_MAP_COPY;
@@ -987,11 +987,11 @@ static int validate_mmap_request(struct file *file,
                             !(file->f_mode & FMODE_WRITE))
                                 return -EACCES;
 
-                        if (IS_APPEND(file->f_path.dentry->d_inode) &&
+                        if (IS_APPEND(file_inode(file)) &&
                             (file->f_mode & FMODE_WRITE))
                                 return -EACCES;
 
-                        if (locks_verify_locked(file->f_path.dentry->d_inode))
+                        if (locks_verify_locked(file_inode(file)))
                                 return -EAGAIN;
 
                         if (!(capabilities & BDI_CAP_MAP_DIRECT))
@@ -1327,8 +1327,8 @@ unsigned long do_mmap_pgoff(struct file *file,
                                 continue;
 
                         /* search for overlapping mappings on the same file */
-                        if (pregion->vm_file->f_path.dentry->d_inode !=
-                            file->f_path.dentry->d_inode)
+                        if (file_inode(pregion->vm_file) !=
+                            file_inode(file))
                                 continue;
 
                         if (pregion->vm_pgoff >= pgend)
diff --git a/mm/shmem.c b/mm/shmem.c
index 39de1d6a077a..ed2befb4952e 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1294,7 +1294,7 @@ unlock:
 
 static int shmem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
-        struct inode *inode = vma->vm_file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(vma->vm_file);
         int error;
         int ret = VM_FAULT_LOCKED;
 
@@ -1312,14 +1312,14 @@ static int shmem_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 #ifdef CONFIG_NUMA
 static int shmem_set_policy(struct vm_area_struct *vma, struct mempolicy *mpol)
 {
-        struct inode *inode = vma->vm_file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(vma->vm_file);
         return mpol_set_shared_policy(&SHMEM_I(inode)->policy, vma, mpol);
 }
 
 static struct mempolicy *shmem_get_policy(struct vm_area_struct *vma,
                                           unsigned long addr)
 {
-        struct inode *inode = vma->vm_file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(vma->vm_file);
         pgoff_t index;
 
         index = ((addr - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;
@@ -1329,7 +1329,7 @@ static struct mempolicy *shmem_get_policy(struct vm_area_struct *vma,
 
 int shmem_lock(struct file *file, int lock, struct user_struct *user)
 {
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(file);
         struct shmem_inode_info *info = SHMEM_I(inode);
         int retval = -ENOMEM;
 
@@ -1464,7 +1464,7 @@ shmem_write_end(struct file *file, struct address_space *mapping,
 
 static void do_shmem_file_read(struct file *filp, loff_t *ppos, read_descriptor_t *desc, read_actor_t actor)
 {
-        struct inode *inode = filp->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(filp);
         struct address_space *mapping = inode->i_mapping;
         pgoff_t index;
         unsigned long offset;
@@ -1807,7 +1807,7 @@ static loff_t shmem_file_llseek(struct file *file, loff_t offset, int whence)
 static long shmem_fallocate(struct file *file, int mode, loff_t offset,
                                                          loff_t len)
 {
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(file);
         struct shmem_sb_info *sbinfo = SHMEM_SB(inode->i_sb);
         struct shmem_falloc shmem_falloc;
         pgoff_t start, index, end;
@@ -2350,7 +2350,7 @@ static int shmem_encode_fh(struct inode *inode, __u32 *fh, int *len,
 {
         if (*len < 3) {
                 *len = 3;
-                return 255;
+                return FILEID_INVALID;
         }
 
         if (inode_unhashed(inode)) {
@@ -2879,6 +2879,16 @@ EXPORT_SYMBOL_GPL(shmem_truncate_range);
 
 /* common code */
 
+static char *shmem_dname(struct dentry *dentry, char *buffer, int buflen)
+{
+        return dynamic_dname(dentry, buffer, buflen, "/%s (deleted)",
+                                dentry->d_name.name);
+}
+
+static struct dentry_operations anon_ops = {
+        .d_dname = shmem_dname
+};
+
 /**
  * shmem_file_setup - get an unlinked file living in tmpfs
  * @name: name for dentry (to be seen in /proc/<pid>/maps
@@ -2887,15 +2897,14 @@ EXPORT_SYMBOL_GPL(shmem_truncate_range);
  */
 struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags)
 {
-        int error;
-        struct file *file;
+        struct file *res;
         struct inode *inode;
         struct path path;
-        struct dentry *root;
+        struct super_block *sb;
         struct qstr this;
 
         if (IS_ERR(shm_mnt))
-                return (void *)shm_mnt;
+                return ERR_CAST(shm_mnt);
 
         if (size < 0 || size > MAX_LFS_FILESIZE)
                 return ERR_PTR(-EINVAL);
@@ -2903,18 +2912,19 @@ struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags
         if (shmem_acct_size(flags, size))
                 return ERR_PTR(-ENOMEM);
 
-        error = -ENOMEM;
+        res = ERR_PTR(-ENOMEM);
         this.name = name;
         this.len = strlen(name);
         this.hash = 0; /* will go */
-        root = shm_mnt->mnt_root;
-        path.dentry = d_alloc(root, &this);
+        sb = shm_mnt->mnt_sb;
+        path.dentry = d_alloc_pseudo(sb, &this);
         if (!path.dentry)
                 goto put_memory;
+        d_set_d_op(path.dentry, &anon_ops);
         path.mnt = mntget(shm_mnt);
 
-        error = -ENOSPC;
-        inode = shmem_get_inode(root->d_sb, NULL, S_IFREG | S_IRWXUGO, 0, flags);
+        res = ERR_PTR(-ENOSPC);
+        inode = shmem_get_inode(sb, NULL, S_IFREG | S_IRWXUGO, 0, flags);
         if (!inode)
                 goto put_dentry;
 
@@ -2923,23 +2933,23 @@ struct file *shmem_file_setup(const char *name, loff_t size, unsigned long flags
         clear_nlink(inode);     /* It is unlinked */
 #ifndef CONFIG_MMU
         error = ramfs_nommu_expand_for_mapping(inode, size);
+        res = ERR_PTR(error);
         if (error)
                 goto put_dentry;
 #endif
 
-        error = -ENFILE;
-        file = alloc_file(&path, FMODE_WRITE | FMODE_READ,
+        res = alloc_file(&path, FMODE_WRITE | FMODE_READ,
                   &shmem_file_operations);
-        if (!file)
+        if (IS_ERR(res))
                 goto put_dentry;
 
-        return file;
+        return res;
 
 put_dentry:
         path_put(&path);
 put_memory:
         shmem_unacct_size(flags, size);
-        return ERR_PTR(error);
+        return res;
 }
 EXPORT_SYMBOL_GPL(shmem_file_setup);
 
diff --git a/mm/swapfile.c b/mm/swapfile.c
index c72c648f750c..a1f7772a01fc 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -1774,7 +1774,7 @@ static int swap_show(struct seq_file *swap, void *v)
         len = seq_path(swap, &file->f_path, " \t\n\\");
         seq_printf(swap, "%*s%s\t%u\t%u\t%d\n",
                         len < 40 ? 40 - len : 1, " ",
-                        S_ISBLK(file->f_path.dentry->d_inode->i_mode) ?
+                        S_ISBLK(file_inode(file)->i_mode) ?
                                 "partition" : "file\t",
                         si->pages << (PAGE_SHIFT - 10),
                         si->inuse_pages << (PAGE_SHIFT - 10),