Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull misc vfs updates from Al Viro:
 "Assorted misc bits and pieces.

  There are several single-topic branches left after this (rename2
  series from Miklos, current_time series from Deepa Dinamani, xattr
  series from Andreas, uaccess stuff from from me) and I'd prefer to
  send those separately"

* 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (39 commits)
  proc: switch auxv to use of __mem_open()
  hpfs: support FIEMAP
  cifs: get rid of unused arguments of CIFSSMBWrite()
  posix_acl: uapi header split
  posix_acl: xattr representation cleanups
  fs/aio.c: eliminate redundant loads in put_aio_ring_file
  fs/internal.h: add const to ns_dentry_operations declaration
  compat: remove compat_printk()
  fs/buffer.c: make __getblk_slow() static
  proc: unsigned file descriptors
  fs/file: more unsigned file descriptors
  fs: compat: remove redundant check of nr_segs
  cachefiles: Fix attempt to read i_blocks after deleting file [ver #2]
  cifs: don't use memcpy() to copy struct iov_iter
  get rid of separate multipage fault-in primitives
  fs: Avoid premature clearing of capabilities
  fs: Give dentry to inode_change_ok() instead of inode
  fuse: Propagate dentry down to inode_change_ok()
  ceph: Propagate dentry down to inode_change_ok()
  xfs: Propagate dentry down to inode_change_ok()
  ...

1 files changed, 27 insertions, 20 deletions

diff --git a/fs/proc/base.c b/fs/proc/base.c
index dc7fe5f3a53c..29fd7ef97be9 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -400,23 +400,6 @@ static const struct file_operations proc_pid_cmdline_ops = {
         .llseek = generic_file_llseek,
 };
 
-static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
-                         struct pid *pid, struct task_struct *task)
-{
-        struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ_FSCREDS);
-        if (mm && !IS_ERR(mm)) {
-                unsigned int nwords = 0;
-                do {
-                        nwords += 2;
-                } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
-                seq_write(m, mm->saved_auxv, nwords * sizeof(mm->saved_auxv[0]));
-                mmput(mm);
-                return 0;
-        } else
-                return PTR_ERR(mm);
-}
-
-
 #ifdef CONFIG_KALLSYMS
 /*
  * Provides a wchan file via kallsyms in a proper one-value-per-file format.
@@ -709,7 +692,7 @@ int proc_setattr(struct dentry *dentry, struct iattr *attr)
         if (attr->ia_valid & ATTR_MODE)
                 return -EPERM;
 
-        error = inode_change_ok(inode, attr);
+        error = setattr_prepare(dentry, attr);
         if (error)
                 return error;
 
@@ -1014,6 +997,30 @@ static const struct file_operations proc_environ_operations = {
         .release        = mem_release,
 };
 
+static int auxv_open(struct inode *inode, struct file *file)
+{
+        return __mem_open(inode, file, PTRACE_MODE_READ_FSCREDS);
+}
+
+static ssize_t auxv_read(struct file *file, char __user *buf,
+                        size_t count, loff_t *ppos)
+{
+        struct mm_struct *mm = file->private_data;
+        unsigned int nwords = 0;
+        do {
+                nwords += 2;
+        } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
+        return simple_read_from_buffer(buf, count, ppos, mm->saved_auxv,
+                                       nwords * sizeof(mm->saved_auxv[0]));
+}
+
+static const struct file_operations proc_auxv_operations = {
+        .open           = auxv_open,
+        .read           = auxv_read,
+        .llseek         = generic_file_llseek,
+        .release        = mem_release,
+};
+
 static ssize_t oom_adj_read(struct file *file, char __user *buf, size_t count,
                             loff_t *ppos)
 {
@@ -2842,7 +2849,7 @@ static const struct pid_entry tgid_base_stuff[] = {
         DIR("net",        S_IRUGO|S_IXUGO, proc_net_inode_operations, proc_net_operations),
 #endif
         REG("environ",    S_IRUSR, proc_environ_operations),
-        ONE("auxv",       S_IRUSR, proc_pid_auxv),
+        REG("auxv",       S_IRUSR, proc_auxv_operations),
         ONE("status",     S_IRUGO, proc_pid_status),
         ONE("personality", S_IRUSR, proc_pid_personality),
         ONE("limits",     S_IRUGO, proc_pid_limits),
@@ -3230,7 +3237,7 @@ static const struct pid_entry tid_base_stuff[] = {
         DIR("net",        S_IRUGO|S_IXUGO, proc_net_inode_operations, proc_net_operations),
 #endif
         REG("environ",   S_IRUSR, proc_environ_operations),
-        ONE("auxv",      S_IRUSR, proc_pid_auxv),
+        REG("auxv",      S_IRUSR, proc_auxv_operations),
         ONE("status",    S_IRUGO, proc_pid_status),
         ONE("personality", S_IRUSR, proc_pid_personality),
         ONE("limits",    S_IRUGO, proc_pid_limits),