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

Pull vfs pile 1 from Al Viro:
 "This is _not_ all; in particular, Miklos' and Jan's stuff is not there
  yet."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (64 commits)
  ext4: initialization of ext4_li_mtx needs to be done earlier
  debugfs-related mode_t whack-a-mole
  hfsplus: add an ioctl to bless files
  hfsplus: change finder_info to u32
  hfsplus: initialise userflags
  qnx4: new helper - try_extent()
  qnx4: get rid of qnx4_bread/qnx4_getblk
  take removal of PF_FORKNOEXEC to flush_old_exec()
  trim includes in inode.c
  um: uml_dup_mmap() relies on ->mmap_sem being held, but activate_mm() doesn't hold it
  um: embed ->stub_pages[] into mmu_context
  gadgetfs: list_for_each_safe() misuse
  ocfs2: fix leaks on failure exits in module_init
  ecryptfs: make register_filesystem() the last potential failure exit
  ntfs: forgets to unregister sysctls on register_filesystem() failure
  logfs: missing cleanup on register_filesystem() failure
  jfs: mising cleanup on register_filesystem() failure
  make configfs_pin_fs() return root dentry on success
  configfs: configfs_create_dir() has parent dentry in dentry->d_parent
  configfs: sanitize configfs_create()
  ...

3 files changed, 9 insertions, 35 deletions

diff --git a/drivers/usb/core/inode.c b/drivers/usb/core/inode.c
index 9e186f3da839..cefa0c8b5b6a 100644
--- a/drivers/usb/core/inode.c
+++ b/drivers/usb/core/inode.c
@@ -50,7 +50,6 @@
 static const struct file_operations default_file_operations;
 static struct vfsmount *usbfs_mount;
 static int usbfs_mount_count;   /* = 0 */
-static int ignore_mount = 0;
 
 static struct dentry *devices_usbfs_dentry;
 static int num_buses;   /* = 0 */
@@ -256,7 +255,7 @@ static int remount(struct super_block *sb, int *flags, char *data)
          * i.e. it's a simple_pin_fs from create_special_files,
          * then ignore it.
          */
-        if (ignore_mount)
+        if (*flags & MS_KERNMOUNT)
                 return 0;
 
         if (parse_options(sb, data)) {
@@ -454,7 +453,6 @@ static const struct super_operations usbfs_ops = {
 static int usbfs_fill_super(struct super_block *sb, void *data, int silent)
 {
         struct inode *inode;
-        struct dentry *root;
 
         sb->s_blocksize = PAGE_CACHE_SIZE;
         sb->s_blocksize_bits = PAGE_CACHE_SHIFT;
@@ -462,19 +460,11 @@ static int usbfs_fill_super(struct super_block *sb, void *data, int silent)
         sb->s_op = &usbfs_ops;
         sb->s_time_gran = 1;
         inode = usbfs_get_inode(sb, S_IFDIR | 0755, 0);
-
-        if (!inode) {
-                dbg("%s: could not get inode!",__func__);
-                return -ENOMEM;
-        }
-
-        root = d_alloc_root(inode);
-        if (!root) {
+        sb->s_root = d_make_root(inode);
+        if (!sb->s_root) {
                 dbg("%s: could not get root dentry!",__func__);
-                iput(inode);
                 return -ENOMEM;
         }
-        sb->s_root = root;
         return 0;
 }
 
@@ -591,11 +581,6 @@ static int create_special_files (void)
         struct dentry *parent;
         int retval;
 
-        /* the simple_pin_fs calls will call remount with no options
-         * without this flag that would overwrite the real mount options (if any)
-         */
-        ignore_mount = 1;
-
         /* create the devices special file */
         retval = simple_pin_fs(&usb_fs_type, &usbfs_mount, &usbfs_mount_count);
         if (retval) {
@@ -603,8 +588,6 @@ static int create_special_files (void)
                 goto exit;
         }
 
-        ignore_mount = 0;
-
         parent = usbfs_mount->mnt_root;
         devices_usbfs_dentry = fs_create_file ("devices",
                                                listmode | S_IFREG, parent,
diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
index 7f445ec723bc..1cbba70836bc 100644
--- a/drivers/usb/gadget/f_fs.c
+++ b/drivers/usb/gadget/f_fs.c
@@ -1063,13 +1063,9 @@ static int ffs_sb_fill(struct super_block *sb, void *_data, int silent)
                                   &simple_dir_operations,
                                   &simple_dir_inode_operations,
                                   &data->perms);
-        if (unlikely(!inode))
+        sb->s_root = d_make_root(inode);
+        if (unlikely(!sb->s_root))
                 goto Enomem;
-        sb->s_root = d_alloc_root(inode);
-        if (unlikely(!sb->s_root)) {
-                iput(inode);
-                goto Enomem;
-        }
 
         /* EP0 file */
         if (unlikely(!ffs_sb_create_file(sb, "ep0", ffs,
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index 4f18a0e46070..8793f32bab11 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -1571,20 +1571,18 @@ delegate:
 
 static void destroy_ep_files (struct dev_data *dev)
 {
-        struct list_head        *entry, *tmp;
-
         DBG (dev, "%s %d\n", __func__, dev->state);
 
         /* dev->state must prevent interference */
 restart:
         spin_lock_irq (&dev->lock);
-        list_for_each_safe (entry, tmp, &dev->epfiles) {
+        while (!list_empty(&dev->epfiles)) {
                 struct ep_data  *ep;
                 struct inode    *parent;
                 struct dentry   *dentry;
 
                 /* break link to FS */
-                ep = list_entry (entry, struct ep_data, epfiles);
+                ep = list_first_entry (&dev->epfiles, struct ep_data, epfiles);
                 list_del_init (&ep->epfiles);
                 dentry = ep->dentry;
                 ep->dentry = NULL;
@@ -1607,8 +1605,7 @@ restart:
                 dput (dentry);
                 mutex_unlock (&parent->i_mutex);
 
-                /* fds may still be open */
-                goto restart;
+                spin_lock_irq (&dev->lock);
         }
         spin_unlock_irq (&dev->lock);
 }
@@ -2061,10 +2058,8 @@ gadgetfs_fill_super (struct super_block *sb, void *opts, int silent)
         if (!inode)
                 goto Enomem;
         inode->i_op = &simple_dir_inode_operations;
-        if (!(sb->s_root = d_alloc_root (inode))) {
-                iput(inode);
+        if (!(sb->s_root = d_make_root (inode)))
                 goto Enomem;
-        }
 
         /* the ep0 file is named after the controller we expect;
          * user mode code can use it for sanity checks, like we do.