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

Pull vfs pile (part one) from Al Viro:
 "Assorted stuff - cleaning namei.c up a bit, fixing ->d_name/->d_parent
  locking violations, etc.

  The most visible changes here are death of FS_REVAL_DOT (replaced with
  "has ->d_weak_revalidate()") and a new helper getting from struct file
  to inode.  Some bits of preparation to xattr method interface changes.

  Misc patches by various people sent this cycle *and* ocfs2 fixes from
  several cycles ago that should've been upstream right then.

  PS: the next vfs pile will be xattr stuff."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (46 commits)
  saner proc_get_inode() calling conventions
  proc: avoid extra pde_put() in proc_fill_super()
  fs: change return values from -EACCES to -EPERM
  fs/exec.c: make bprm_mm_init() static
  ocfs2/dlm: use GFP_ATOMIC inside a spin_lock
  ocfs2: fix possible use-after-free with AIO
  ocfs2: Fix oops in ocfs2_fast_symlink_readpage() code path
  get_empty_filp()/alloc_file() leave both ->f_pos and ->f_version zero
  target: writev() on single-element vector is pointless
  export kernel_write(), convert open-coded instances
  fs: encode_fh: return FILEID_INVALID if invalid fid_type
  kill f_vfsmnt
  vfs: kill FS_REVAL_DOT by adding a d_weak_revalidate dentry op
  nfsd: handle vfs_getattr errors in acl protocol
  switch vfs_getattr() to struct path
  default SET_PERSONALITY() in linux/elf.h
  ceph: prepopulate inodes only when request is aborted
  d_hash_and_lookup(): export, switch open-coded instances
  9p: switch v9fs_set_create_acl() to inode+fid, do it before d_instantiate()
  9p: split dropping the acls from v9fs_set_create_acl()
  ...

10 files changed, 22 insertions, 47 deletions

diff --git a/kernel/acct.c b/kernel/acct.c
index e8b1627ab9c7..b9bd7f098ee5 100644
--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -205,7 +205,7 @@ static int acct_on(struct filename *pathname)
         if (IS_ERR(file))
                 return PTR_ERR(file);
 
-        if (!S_ISREG(file->f_path.dentry->d_inode->i_mode)) {
+        if (!S_ISREG(file_inode(file)->i_mode)) {
                 filp_close(file, NULL);
                 return -EACCES;
         }
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index b5c64327e712..fb2fb11fbb25 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -2645,7 +2645,7 @@ static struct dentry *cgroup_lookup(struct inode *dir, struct dentry *dentry, un
  */
 static inline struct cftype *__file_cft(struct file *file)
 {
-        if (file->f_dentry->d_inode->i_fop != &cgroup_file_operations)
+        if (file_inode(file)->i_fop != &cgroup_file_operations)
                 return ERR_PTR(-EINVAL);
         return __d_cft(file->f_dentry);
 }
@@ -3902,7 +3902,7 @@ static int cgroup_write_event_control(struct cgroup *cgrp, struct cftype *cft,
 
         /* the process need read permission on control file */
         /* AV: shouldn't we check that it's been opened for read instead? */
-        ret = inode_permission(cfile->f_path.dentry->d_inode, MAY_READ);
+        ret = inode_permission(file_inode(cfile), MAY_READ);
         if (ret < 0)
                 goto fail;
 
@@ -5489,7 +5489,7 @@ struct cgroup_subsys_state *cgroup_css_from_dir(struct file *f, int id)
         struct inode *inode;
         struct cgroup_subsys_state *css;
 
-        inode = f->f_dentry->d_inode;
+        inode = file_inode(f);
         /* check in cgroup filesystem dir */
         if (inode->i_op != &cgroup_dir_inode_operations)
                 return ERR_PTR(-EBADF);
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 5c75791d7269..ccc457e36354 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -3691,7 +3691,7 @@ unlock:
 
 static int perf_fasync(int fd, struct file *filp, int on)
 {
-        struct inode *inode = filp->f_path.dentry->d_inode;
+        struct inode *inode = file_inode(filp);
         struct perf_event *event = filp->private_data;
         int retval;
 
diff --git a/kernel/fork.c b/kernel/fork.c
index 4133876d8cd2..8f62b2a0f120 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -413,7 +413,7 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
                 tmp->vm_next = tmp->vm_prev = NULL;
                 file = tmp->vm_file;
                 if (file) {
-                        struct inode *inode = file->f_path.dentry->d_inode;
+                        struct inode *inode = file_inode(file);
                         struct address_space *mapping = file->f_mapping;
 
                         get_file(file);
diff --git a/kernel/irq/proc.c b/kernel/irq/proc.c
index 4bd4faa6323a..397db02209ed 100644
--- a/kernel/irq/proc.c
+++ b/kernel/irq/proc.c
@@ -76,7 +76,7 @@ static int irq_affinity_list_proc_show(struct seq_file *m, void *v)
 static ssize_t write_irq_affinity(int type, struct file *file,
                 const char __user *buffer, size_t count, loff_t *pos)
 {
-        unsigned int irq = (int)(long)PDE(file->f_path.dentry->d_inode)->data;
+        unsigned int irq = (int)(long)PDE(file_inode(file))->data;
         cpumask_var_t new_value;
         int err;
 
diff --git a/kernel/module.c b/kernel/module.c
index 921bed4794e9..0925c9a71975 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -2541,7 +2541,7 @@ static int copy_module_from_fd(int fd, struct load_info *info)
         if (err)
                 goto out;
 
-        err = vfs_getattr(file->f_vfsmnt, file->f_dentry, &stat);
+        err = vfs_getattr(&file->f_path, &stat);
         if (err)
                 goto out;
 
diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
index b781e66a8f2c..afc0456f227a 100644
--- a/kernel/nsproxy.c
+++ b/kernel/nsproxy.c
@@ -250,7 +250,7 @@ SYSCALL_DEFINE2(setns, int, fd, int, nstype)
                 return PTR_ERR(file);
 
         err = -EINVAL;
-        ei = PROC_I(file->f_dentry->d_inode);
+        ei = PROC_I(file_inode(file));
         ops = ei->ns_ops;
         if (nstype && (ops->type != nstype))
                 goto out;
diff --git a/kernel/relay.c b/kernel/relay.c
index e8cd2027abbd..01ab081ac53a 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -1139,7 +1139,7 @@ static ssize_t relay_file_read_subbufs(struct file *filp, loff_t *ppos,
         if (!desc->count)
                 return 0;
 
-        mutex_lock(&filp->f_path.dentry->d_inode->i_mutex);
+        mutex_lock(&file_inode(filp)->i_mutex);
         do {
                 if (!relay_file_read_avail(buf, *ppos))
                         break;
@@ -1159,7 +1159,7 @@ static ssize_t relay_file_read_subbufs(struct file *filp, loff_t *ppos,
                         *ppos = relay_file_read_end_pos(buf, read_start, ret);
                 }
         } while (desc->count && ret);
-        mutex_unlock(&filp->f_path.dentry->d_inode->i_mutex);
+        mutex_unlock(&file_inode(filp)->i_mutex);
 
         return desc->written;
 }
diff --git a/kernel/sys.c b/kernel/sys.c
index 2e18d33ca775..e10566bee399 100644
--- a/kernel/sys.c
+++ b/kernel/sys.c
@@ -1794,14 +1794,14 @@ SYSCALL_DEFINE1(umask, int, mask)
 static int prctl_set_mm_exe_file(struct mm_struct *mm, unsigned int fd)
 {
         struct fd exe;
-        struct dentry *dentry;
+        struct inode *inode;
         int err;
 
         exe = fdget(fd);
         if (!exe.file)
                 return -EBADF;
 
-        dentry = exe.file->f_path.dentry;
+        inode = file_inode(exe.file);
 
         /*
          * Because the original mm->exe_file points to executable file, make
@@ -1809,11 +1809,11 @@ static int prctl_set_mm_exe_file(struct mm_struct *mm, unsigned int fd)
          * overall picture.
          */
         err = -EACCES;
-        if (!S_ISREG(dentry->d_inode->i_mode)   ||
+        if (!S_ISREG(inode->i_mode)     ||
             exe.file->f_path.mnt->mnt_flags & MNT_NOEXEC)
                 goto exit;
 
-        err = inode_permission(dentry->d_inode, MAY_EXEC);
+        err = inode_permission(inode, MAY_EXEC);
         if (err)
                 goto exit;
 
diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
index b669ca1fa103..b25115e8c7f3 100644
--- a/kernel/sysctl_binary.c
+++ b/kernel/sysctl_binary.c
@@ -970,7 +970,6 @@ out:
 static ssize_t bin_intvec(struct file *file,
         void __user *oldval, size_t oldlen, void __user *newval, size_t newlen)
 {
-        mm_segment_t old_fs = get_fs();
         ssize_t copied = 0;
         char *buffer;
         ssize_t result;
@@ -983,13 +982,10 @@ static ssize_t bin_intvec(struct file *file,
         if (oldval && oldlen) {
                 unsigned __user *vec = oldval;
                 size_t length = oldlen / sizeof(*vec);
-                loff_t pos = 0;
                 char *str, *end;
                 int i;
 
-                set_fs(KERNEL_DS);
-                result = vfs_read(file, buffer, BUFSZ - 1, &pos);
-                set_fs(old_fs);
+                result = kernel_read(file, 0, buffer, BUFSZ - 1);
                 if (result < 0)
                         goto out_kfree;
 
@@ -1016,7 +1012,6 @@ static ssize_t bin_intvec(struct file *file,
         if (newval && newlen) {
                 unsigned __user *vec = newval;
                 size_t length = newlen / sizeof(*vec);
-                loff_t pos = 0;
                 char *str, *end;
                 int i;
 
@@ -1032,9 +1027,7 @@ static ssize_t bin_intvec(struct file *file,
                         str += snprintf(str, end - str, "%lu\t", value);
                 }
 
-                set_fs(KERNEL_DS);
-                result = vfs_write(file, buffer, str - buffer, &pos);
-                set_fs(old_fs);
+                result = kernel_write(file, buffer, str - buffer, 0);
                 if (result < 0)
                         goto out_kfree;
         }
@@ -1048,7 +1041,6 @@ out:
 static ssize_t bin_ulongvec(struct file *file,
         void __user *oldval, size_t oldlen, void __user *newval, size_t newlen)
 {
-        mm_segment_t old_fs = get_fs();
         ssize_t copied = 0;
         char *buffer;
         ssize_t result;
@@ -1061,13 +1053,10 @@ static ssize_t bin_ulongvec(struct file *file,
         if (oldval && oldlen) {
                 unsigned long __user *vec = oldval;
                 size_t length = oldlen / sizeof(*vec);
-                loff_t pos = 0;
                 char *str, *end;
                 int i;
 
-                set_fs(KERNEL_DS);
-                result = vfs_read(file, buffer, BUFSZ - 1, &pos);
-                set_fs(old_fs);
+                result = kernel_read(file, 0, buffer, BUFSZ - 1);
                 if (result < 0)
                         goto out_kfree;
 
@@ -1094,7 +1083,6 @@ static ssize_t bin_ulongvec(struct file *file,
         if (newval && newlen) {
                 unsigned long __user *vec = newval;
                 size_t length = newlen / sizeof(*vec);
-                loff_t pos = 0;
                 char *str, *end;
                 int i;
 
@@ -1110,9 +1098,7 @@ static ssize_t bin_ulongvec(struct file *file,
                         str += snprintf(str, end - str, "%lu\t", value);
                 }
 
-                set_fs(KERNEL_DS);
-                result = vfs_write(file, buffer, str - buffer, &pos);
-                set_fs(old_fs);
+                result = kernel_write(file, buffer, str - buffer, 0);
                 if (result < 0)
                         goto out_kfree;
         }
@@ -1126,19 +1112,15 @@ out:
 static ssize_t bin_uuid(struct file *file,
         void __user *oldval, size_t oldlen, void __user *newval, size_t newlen)
 {
-        mm_segment_t old_fs = get_fs();
         ssize_t result, copied = 0;
 
         /* Only supports reads */
         if (oldval && oldlen) {
-                loff_t pos = 0;
                 char buf[40], *str = buf;
                 unsigned char uuid[16];
                 int i;
 
-                set_fs(KERNEL_DS);
-                result = vfs_read(file, buf, sizeof(buf) - 1, &pos);
-                set_fs(old_fs);
+                result = kernel_read(file, 0, buf, sizeof(buf) - 1);
                 if (result < 0)
                         goto out;
 
@@ -1174,18 +1156,14 @@ out:
 static ssize_t bin_dn_node_address(struct file *file,
         void __user *oldval, size_t oldlen, void __user *newval, size_t newlen)
 {
-        mm_segment_t old_fs = get_fs();
         ssize_t result, copied = 0;
 
         if (oldval && oldlen) {
-                loff_t pos = 0;
                 char buf[15], *nodep;
                 unsigned long area, node;
                 __le16 dnaddr;
 
-                set_fs(KERNEL_DS);
-                result = vfs_read(file, buf, sizeof(buf) - 1, &pos);
-                set_fs(old_fs);
+                result = kernel_read(file, 0, buf, sizeof(buf) - 1);
                 if (result < 0)
                         goto out;
 
@@ -1214,7 +1192,6 @@ static ssize_t bin_dn_node_address(struct file *file,
         }
 
         if (newval && newlen) {
-                loff_t pos = 0;
                 __le16 dnaddr;
                 char buf[15];
                 int len;
@@ -1231,9 +1208,7 @@ static ssize_t bin_dn_node_address(struct file *file,
                                 le16_to_cpu(dnaddr) >> 10,
                                 le16_to_cpu(dnaddr) & 0x3ff);
 
-                set_fs(KERNEL_DS);
-                result = vfs_write(file, buf, len, &pos);
-                set_fs(old_fs);
+                result = kernel_write(file, buf, len, 0);
                 if (result < 0)
                         goto out;
         }