Merge branch 'akpm' (patches from Andrew)

Merge more updates from Andrew Morton:

 - procfs updates

 - various misc bits

 - lib/ updates

 - epoll updates

 - autofs

 - fatfs

 - a few more MM bits

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (58 commits)
  mm/page_io.c: fix polled swap page in
  checkpatch: add Co-developed-by to signature tags
  docs: fix Co-Developed-by docs
  drivers/base/platform.c: kmemleak ignore a known leak
  fs: don't open code lru_to_page()
  fs/: remove caller signal_pending branch predictions
  mm/: remove caller signal_pending branch predictions
  arch/arc/mm/fault.c: remove caller signal_pending_branch predictions
  kernel/sched/: remove caller signal_pending branch predictions
  kernel/locking/mutex.c: remove caller signal_pending branch predictions
  mm: select HAVE_MOVE_PMD on x86 for faster mremap
  mm: speed up mremap by 20x on large regions
  mm: treewide: remove unused address argument from pte_alloc functions
  initramfs: cleanup incomplete rootfs
  scripts/gdb: fix lx-version string output
  kernel/kcov.c: mark write_comp_data() as notrace
  kernel/sysctl: add panic_print into sysctl
  panic: add options to print system info when panic happens
  bfs: extra sanity checking and static inode bitmap
  exec: separate MM_ANONPAGES and RLIMIT_STACK accounting
  ...

1 files changed, 7 insertions, 20 deletions

diff --git a/fs/autofs/dev-ioctl.c b/fs/autofs/dev-ioctl.c
index 86eafda4a652..e9fe74d1541b 100644
--- a/fs/autofs/dev-ioctl.c
+++ b/fs/autofs/dev-ioctl.c
@@ -151,22 +151,6 @@ out:
         return err;
 }
 
-/*
- * Get the autofs super block info struct from the file opened on
- * the autofs mount point.
- */
-static struct autofs_sb_info *autofs_dev_ioctl_sbi(struct file *f)
-{
-        struct autofs_sb_info *sbi = NULL;
-        struct inode *inode;
-
-        if (f) {
-                inode = file_inode(f);
-                sbi = autofs_sbi(inode->i_sb);
-        }
-        return sbi;
-}
-
 /* Return autofs dev ioctl version */
 static int autofs_dev_ioctl_version(struct file *fp,
                                     struct autofs_sb_info *sbi,
@@ -366,7 +350,7 @@ static int autofs_dev_ioctl_setpipefd(struct file *fp,
         pipefd = param->setpipefd.pipefd;
 
         mutex_lock(&sbi->wq_mutex);
-        if (!sbi->catatonic) {
+        if (!(sbi->flags & AUTOFS_SBI_CATATONIC)) {
                 mutex_unlock(&sbi->wq_mutex);
                 return -EBUSY;
         } else {
@@ -393,7 +377,7 @@ static int autofs_dev_ioctl_setpipefd(struct file *fp,
                 swap(sbi->oz_pgrp, new_pid);
                 sbi->pipefd = pipefd;
                 sbi->pipe = pipe;
-                sbi->catatonic = 0;
+                sbi->flags &= ~AUTOFS_SBI_CATATONIC;
         }
 out:
         put_pid(new_pid);
@@ -658,6 +642,8 @@ static int _autofs_dev_ioctl(unsigned int command,
         if (cmd != AUTOFS_DEV_IOCTL_VERSION_CMD &&
             cmd != AUTOFS_DEV_IOCTL_OPENMOUNT_CMD &&
             cmd != AUTOFS_DEV_IOCTL_CLOSEMOUNT_CMD) {
+                struct super_block *sb;
+
                 fp = fget(param->ioctlfd);
                 if (!fp) {
                         if (cmd == AUTOFS_DEV_IOCTL_ISMOUNTPOINT_CMD)
@@ -666,12 +652,13 @@ static int _autofs_dev_ioctl(unsigned int command,
                         goto out;
                 }
 
-                sbi = autofs_dev_ioctl_sbi(fp);
-                if (!sbi || sbi->magic != AUTOFS_SBI_MAGIC) {
+                sb = file_inode(fp)->i_sb;
+                if (sb->s_type != &autofs_fs_type) {
                         err = -EINVAL;
                         fput(fp);
                         goto out;
                 }
+                sbi = autofs_sbi(sb);
 
                 /*
                  * Admin needs to be able to set the mount catatonic in