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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  ext[34]: avoid i_nlink warnings triggered by drop_nlink/inc_nlink kludge in symlink()
  exofs: oops after late failure in mount
  devpts: fix double-free on mount failure
  ... and the same for gadgetfs
  functionfs: unfuck failure exits on mount

6 files changed, 27 insertions, 40 deletions

diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
index acb38004eec0..b5f6f9fef9c7 100644
--- a/drivers/usb/gadget/f_fs.c
+++ b/drivers/usb/gadget/f_fs.c
@@ -1037,7 +1037,6 @@ static int ffs_sb_fill(struct super_block *sb, void *_data, int silent)
 {
         struct ffs_sb_fill_data *data = _data;
         struct inode    *inode;
-        struct dentry   *d;
         struct ffs_data *ffs;
 
         ENTER();
@@ -1045,7 +1044,7 @@ static int ffs_sb_fill(struct super_block *sb, void *_data, int silent)
         /* Initialise data */
         ffs = ffs_data_new();
         if (unlikely(!ffs))
-                goto enomem0;
+                goto Enomem;
 
         ffs->sb              = sb;
         ffs->dev_name        = data->dev_name;
@@ -1065,26 +1064,21 @@ static int ffs_sb_fill(struct super_block *sb, void *_data, int silent)
                                   &simple_dir_inode_operations,
                                   &data->perms);
         if (unlikely(!inode))
-                goto enomem1;
-        d = d_alloc_root(inode);
-        if (unlikely(!d))
-                goto enomem2;
-        sb->s_root = d;
+                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,
                                          &ffs_ep0_operations, NULL)))
-                goto enomem3;
+                goto Enomem;
 
         return 0;
 
-enomem3:
-        dput(d);
-enomem2:
-        iput(inode);
-enomem1:
-        ffs_data_put(ffs);
-enomem0:
+Enomem:
         return -ENOMEM;
 }
 
@@ -1196,14 +1190,11 @@ ffs_fs_mount(struct file_system_type *t, int flags,
 static void
 ffs_fs_kill_sb(struct super_block *sb)
 {
-        void *ptr;
-
         ENTER();
 
         kill_litter_super(sb);
-        ptr = xchg(&sb->s_fs_info, NULL);
-        if (ptr)
-                ffs_data_put(ptr);
+        if (sb->s_fs_info)
+                ffs_data_put(sb->s_fs_info);
 }
 
 static struct file_system_type ffs_fs_type = {
diff --git a/drivers/usb/gadget/inode.c b/drivers/usb/gadget/inode.c
index 6ccae2707e59..6b7ea25af0fe 100644
--- a/drivers/usb/gadget/inode.c
+++ b/drivers/usb/gadget/inode.c
@@ -2035,7 +2035,6 @@ static int
 gadgetfs_fill_super (struct super_block *sb, void *opts, int silent)
 {
         struct inode    *inode;
-        struct dentry   *d;
         struct dev_data *dev;
 
         if (the_device)
@@ -2058,24 +2057,27 @@ gadgetfs_fill_super (struct super_block *sb, void *opts, int silent)
                         NULL, &simple_dir_operations,
                         S_IFDIR | S_IRUGO | S_IXUGO);
         if (!inode)
-                goto enomem0;
+                goto Enomem;
         inode->i_op = &simple_dir_inode_operations;
-        if (!(d = d_alloc_root (inode)))
-                goto enomem1;
-        sb->s_root = d;
+        if (!(sb->s_root = d_alloc_root (inode))) {
+                iput(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.
          */
         dev = dev_new ();
         if (!dev)
-                goto enomem2;
+                goto Enomem;
 
         dev->sb = sb;
         if (!gadgetfs_create_file (sb, CHIP,
                                 dev, &dev_init_operations,
-                                &dev->dentry))
-                goto enomem3;
+                                &dev->dentry)) {
+                put_dev(dev);
+                goto Enomem;
+        }
 
         /* other endpoint files are available after hardware setup,
          * from binding to a controller.
@@ -2083,13 +2085,7 @@ gadgetfs_fill_super (struct super_block *sb, void *opts, int silent)
         the_device = dev;
         return 0;
 
-enomem3:
-        put_dev (dev);
-enomem2:
-        dput (d);
-enomem1:
-        iput (inode);
-enomem0:
+Enomem:
         return -ENOMEM;
 }
 
diff --git a/fs/devpts/inode.c b/fs/devpts/inode.c
index 79673eb71151..c4e2a58a2e82 100644
--- a/fs/devpts/inode.c
+++ b/fs/devpts/inode.c
@@ -301,7 +301,7 @@ devpts_fill_super(struct super_block *s, void *data, int silent)
 
         inode = new_inode(s);
         if (!inode)
-                goto free_fsi;
+                goto fail;
         inode->i_ino = 1;
         inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
         inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR;
@@ -316,8 +316,6 @@ devpts_fill_super(struct super_block *s, void *data, int silent)
         printk(KERN_ERR "devpts: get root dentry failed\n");
         iput(inode);
 
-free_fsi:
-        kfree(s->s_fs_info);
 fail:
         return -ENOMEM;
 }
diff --git a/fs/exofs/super.c b/fs/exofs/super.c
index 8addfe314dc7..d22cd168c6ee 100644
--- a/fs/exofs/super.c
+++ b/fs/exofs/super.c
@@ -838,6 +838,8 @@ static int exofs_fill_super(struct super_block *sb, void *data, int silent)
         ret = bdi_setup_and_register(&sbi->bdi, "exofs", BDI_CAP_MAP_COPY);
         if (ret) {
                 EXOFS_DBGMSG("Failed to bdi_setup_and_register\n");
+                dput(sb->s_root);
+                sb->s_root = NULL;
                 goto free_sbi;
         }
 
diff --git a/fs/ext3/namei.c b/fs/ext3/namei.c
index 4f35b2f315d4..d269821203fd 100644
--- a/fs/ext3/namei.c
+++ b/fs/ext3/namei.c
@@ -2272,7 +2272,7 @@ retry:
                         err = PTR_ERR(handle);
                         goto err_drop_inode;
                 }
-                inc_nlink(inode);
+                set_nlink(inode, 1);
                 err = ext3_orphan_del(handle, inode);
                 if (err) {
                         ext3_journal_stop(handle);
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 86edc45b52a4..2043f482375d 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -2315,7 +2315,7 @@ retry:
                         err = PTR_ERR(handle);
                         goto err_drop_inode;
                 }
-                inc_nlink(inode);
+                set_nlink(inode, 1);
                 err = ext4_orphan_del(handle, inode);
                 if (err) {
                         ext4_journal_stop(handle);