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

Pull second try at vfs part d#2 from Al Viro:
 "Miklos' first series (with do_lookup() rewrite split into edible
  chunks) + assorted bits and pieces.

  The 'untangling of do_lookup()' series is is a splitup of what used to
  be a monolithic patch from Miklos, so this series is basically "how do
  I convince myself that his patch is correct (or find a hole in it)".
  No holes found and I like the resulting cleanup, so in it went..."

Changes from try 1: Fix a boot problem with selinux, and commit messages
prettied up a bit.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (24 commits)
  vfs: fix out-of-date dentry_unhash() comment
  vfs: split __lookup_hash
  untangling do_lookup() - take __lookup_hash()-calling case out of line.
  untangling do_lookup() - switch to calling __lookup_hash()
  untangling do_lookup() - merge d_alloc_and_lookup() callers
  untangling do_lookup() - merge failure exits in !dentry case
  untangling do_lookup() - massage !dentry case towards __lookup_hash()
  untangling do_lookup() - get rid of need_reval in !dentry case
  untangling do_lookup() - eliminate a loop.
  untangling do_lookup() - expand the area under ->i_mutex
  untangling do_lookup() - isolate !dentry stuff from the rest of it.
  vfs: move MAY_EXEC check from __lookup_hash()
  vfs: don't revalidate just looked up dentry
  vfs: fix d_need_lookup/d_revalidate order in do_lookup
  ext3: move headers to fs/ext3/
  migrate ext2_fs.h guts to fs/ext2/ext2.h
  new helper: ext2_image_size()
  get rid of pointless includes of ext2_fs.h
  ext2: No longer export ext2_fs.h to user space
  mtdchar: kill persistently held vfsmount
  ...

diff --combined drivers/mtd/mtdchar.c
index 55d8232,28c585f..94eb05b
--- 1/drivers/mtd/mtdchar.c
--- 2/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@@ -39,7 -39,6 +39,6 @@@
  #include <asm/uaccess.h>
  
  static DEFINE_MUTEX(mtd_mutex);
- static struct vfsmount *mtd_inode_mnt __read_mostly;
  
  /*
   * Data structure to hold the pointer to the mtd device as well
@@@ -75,7 -74,9 +74,9 @@@ static loff_t mtdchar_lseek(struct fil
        return -EINVAL;
  }
  
- 
+ static int count;
+ static struct vfsmount *mnt;
+ static struct file_system_type mtd_inodefs_type;
  
  static int mtdchar_open(struct inode *inode, struct file *file)
  {
@@@ -92,6 -93,10 +93,10 @@@
        if ((file->f_mode & FMODE_WRITE) && (minor & 1))
                return -EACCES;
  
+       ret = simple_pin_fs(&mtd_inodefs_type, &mnt, &count);
+       if (ret)
+               return ret;
+ 
        mutex_lock(&mtd_mutex);
        mtd = get_mtd_device(NULL, devnum);
  
@@@ -106,7 -111,7 +111,7 @@@
                goto out;
        }
  
-       mtd_ino = iget_locked(mtd_inode_mnt->mnt_sb, devnum);
+       mtd_ino = iget_locked(mnt->mnt_sb, devnum);
        if (!mtd_ino) {
                put_mtd_device(mtd);
                ret = -ENOMEM;
@@@ -141,6 -146,7 +146,7 @@@
  
  out:
        mutex_unlock(&mtd_mutex);
+       simple_release_fs(&mnt, &count);
        return ret;
  } /* mtdchar_open */
  
@@@ -162,6 -168,7 +168,7 @@@ static int mtdchar_close(struct inode *
        put_mtd_device(mtd);
        file->private_data = NULL;
        kfree(mfi);
+       simple_release_fs(&mnt, &count);
  
        return 0;
  } /* mtdchar_close */
@@@ -405,7 -412,7 +412,7 @@@ static int mtdchar_writeoob(struct fil
        if (length > 4096)
                return -EINVAL;
  
 -      if (!mtd->write_oob)
 +      if (!mtd->_write_oob)
                ret = -EOPNOTSUPP;
        else
                ret = access_ok(VERIFY_READ, ptr, length) ? 0 : -EFAULT;
@@@ -576,7 -583,7 +583,7 @@@ static int mtdchar_write_ioctl(struct m
                        !access_ok(VERIFY_READ, req.usr_data, req.len) ||
                        !access_ok(VERIFY_READ, req.usr_oob, req.ooblen))
                return -EFAULT;
 -      if (!mtd->write_oob)
 +      if (!mtd->_write_oob)
                return -EOPNOTSUPP;
  
        ops.mode = req.mode;
@@@ -1175,10 -1182,15 +1182,15 @@@ static const struct file_operations mtd
  #endif
  };
  
+ static const struct super_operations mtd_ops = {
+       .drop_inode = generic_delete_inode,
+       .statfs = simple_statfs,
+ };
+ 
  static struct dentry *mtd_inodefs_mount(struct file_system_type *fs_type,
                                int flags, const char *dev_name, void *data)
  {
-       return mount_pseudo(fs_type, "mtd_inode:", NULL, NULL, MTD_INODE_FS_MAGIC);
+       return mount_pseudo(fs_type, "mtd_inode:", &mtd_ops, NULL, MTD_INODE_FS_MAGIC);
  }
  
  static struct file_system_type mtd_inodefs_type = {
@@@ -1187,26 -1199,6 +1199,6 @@@
         .kill_sb = kill_anon_super,
  };
  
- static void mtdchar_notify_add(struct mtd_info *mtd)
- {
- }
- 
- static void mtdchar_notify_remove(struct mtd_info *mtd)
- {
-       struct inode *mtd_ino = ilookup(mtd_inode_mnt->mnt_sb, mtd->index);
- 
-       if (mtd_ino) {
-               /* Destroy the inode if it exists */
-               clear_nlink(mtd_ino);
-               iput(mtd_ino);
-       }
- }
- 
- static struct mtd_notifier mtdchar_notifier = {
-       .add = mtdchar_notify_add,
-       .remove = mtdchar_notify_remove,
- };
- 
  static int __init init_mtdchar(void)
  {
        int ret;
@@@ -1224,19 -1216,8 +1216,8 @@@
                pr_notice("Can't register mtd_inodefs filesystem: %d\n", ret);
                goto err_unregister_chdev;
        }
- 
-       mtd_inode_mnt = kern_mount(&mtd_inodefs_type);
-       if (IS_ERR(mtd_inode_mnt)) {
-               ret = PTR_ERR(mtd_inode_mnt);
-               pr_notice("Error mounting mtd_inodefs filesystem: %d\n", ret);
-               goto err_unregister_filesystem;
-       }
-       register_mtd_user(&mtdchar_notifier);
- 
        return ret;
  
- err_unregister_filesystem:
-       unregister_filesystem(&mtd_inodefs_type);
  err_unregister_chdev:
        __unregister_chrdev(MTD_CHAR_MAJOR, 0, 1 << MINORBITS, "mtd");
        return ret;
@@@ -1244,8 -1225,6 +1225,6 @@@
  
  static void __exit cleanup_mtdchar(void)
  {
-       unregister_mtd_user(&mtdchar_notifier);
-       kern_unmount(mtd_inode_mnt);
        unregister_filesystem(&mtd_inodefs_type);
        __unregister_chrdev(MTD_CHAR_MAJOR, 0, 1 << MINORBITS, "mtd");
  }