2 files changed, 8 insertions, 6 deletions

diff --git a/fs/autofs/inode.c b/fs/autofs/inode.c
index 38ede5c9d6fd..f968d1342808 100644
--- a/fs/autofs/inode.c
+++ b/fs/autofs/inode.c
@@ -28,10 +28,11 @@ void autofs_kill_sb(struct super_block *sb)
         /*
          * In the event of a failure in get_sb_nodev the superblock
          * info is not present so nothing else has been setup, so
-         * just exit when we are called from deactivate_super.
+         * just call kill_anon_super when we are called from
+         * deactivate_super.
          */
         if (!sbi)
-                return;
+                goto out_kill_sb;
 
         if ( !sbi->catatonic )
                 autofs_catatonic_mode(sbi); /* Free wait queues, close pipe */
@@ -44,6 +45,7 @@ void autofs_kill_sb(struct super_block *sb)
 
         kfree(sb->s_fs_info);
 
+out_kill_sb:
         DPRINTK(("autofs: shutting down\n"));
         kill_anon_super(sb);
 }
@@ -209,7 +211,6 @@ fail_iput:
 fail_free:
         kfree(sbi);
         s->s_fs_info = NULL;
-        kill_anon_super(s);
 fail_unlock:
         return -EINVAL;
 }
diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
index ce7c0f1dd529..9c48250fd726 100644
--- a/fs/autofs4/inode.c
+++ b/fs/autofs4/inode.c
@@ -152,10 +152,11 @@ void autofs4_kill_sb(struct super_block *sb)
         /*
          * In the event of a failure in get_sb_nodev the superblock
          * info is not present so nothing else has been setup, so
-         * just exit when we are called from deactivate_super.
+         * just call kill_anon_super when we are called from
+         * deactivate_super.
          */
         if (!sbi)
-                return;
+                goto out_kill_sb;
 
         sb->s_fs_info = NULL;
 
@@ -167,6 +168,7 @@ void autofs4_kill_sb(struct super_block *sb)
 
         kfree(sbi);
 
+out_kill_sb:
         DPRINTK("shutting down");
         kill_anon_super(sb);
 }
@@ -426,7 +428,6 @@ fail_ino:
 fail_free:
         kfree(sbi);
         s->s_fs_info = NULL;
-        kill_anon_super(s);
 fail_unlock:
         return -EINVAL;
 }