Merge branch 'work.whack-a-mole' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull mode_t whack-a-mole from Al Viro:
 "For all internal uses we want umode_t, which is arch-independent;
  mode_t (or __kernel_mode_t, for that matter) is wrong outside of
  userland ABI.

  Unfortunately, that crap keeps coming back and needs to be put down
  from time to time..."

* 'work.whack-a-mole' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  mode_t whack-a-mole: task_dump_owner()

diff --cc fs/proc/base.c
Simple merge

diff --cc fs/proc/internal.h
index 9aad373cf11d7362383c52f36dc836802626bd58,5bc75e56a8defd6a984856781db75a543080b11b..4a67188c8d74cdc4269c3d60a60b3245cd9837e9
--- 1/fs/proc/internal.h
--- 2/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@@ -100,10 -100,31 +100,10 @@@ static inline struct task_struct *get_p
        return get_pid_task(proc_pid(inode), PIDTYPE_PID);
  }
  
- void task_dump_owner(struct task_struct *task, mode_t mode,
+ void task_dump_owner(struct task_struct *task, umode_t mode,
                     kuid_t *ruid, kgid_t *rgid);
  
 -static inline unsigned name_to_int(const struct qstr *qstr)
 -{
 -      const char *name = qstr->name;
 -      int len = qstr->len;
 -      unsigned n = 0;
 -
 -      if (len > 1 && *name == '0')
 -              goto out;
 -      while (len-- > 0) {
 -              unsigned c = *name++ - '0';
 -              if (c > 9)
 -                      goto out;
 -              if (n >= (~0U-9)/10)
 -                      goto out;
 -              n *= 10;
 -              n += c;
 -      }
 -      return n;
 -out:
 -      return ~0U;
 -}
 -
 +unsigned name_to_int(const struct qstr *qstr);
  /*
   * Offset of the first process in the /proc root directory..
   */