2 files changed, 5 insertions, 2 deletions

diff --git a/fs/autofs/expire.c b/fs/autofs/expire.c
index d441244b79df..28d9c2b1b3bb 100644
--- a/fs/autofs/expire.c
+++ b/fs/autofs/expire.c
@@ -596,7 +596,6 @@ int autofs_expire_run(struct super_block *sb,
         pkt.len = dentry->d_name.len;
         memcpy(pkt.name, dentry->d_name.name, pkt.len);
         pkt.name[pkt.len] = '\0';
-        dput(dentry);
 
         if (copy_to_user(pkt_p, &pkt, sizeof(struct autofs_packet_expire)))
                 ret = -EFAULT;
@@ -609,6 +608,8 @@ int autofs_expire_run(struct super_block *sb,
         complete_all(&ino->expire_complete);
         spin_unlock(&sbi->fs_lock);
 
+        dput(dentry);
+
         return ret;
 }
 
diff --git a/fs/autofs/inode.c b/fs/autofs/inode.c
index 0e8ea2d9a2bb..078992eee299 100644
--- a/fs/autofs/inode.c
+++ b/fs/autofs/inode.c
@@ -266,8 +266,10 @@ int autofs_fill_super(struct super_block *s, void *data, int silent)
         }
         root_inode = autofs_get_inode(s, S_IFDIR | 0755);
         root = d_make_root(root_inode);
-        if (!root)
+        if (!root) {
+                ret = -ENOMEM;
                 goto fail_ino;
+        }
         pipe = NULL;
 
         root->d_fsdata = ino;