diff --git a/[refs] b/[refs]
index b54e5fffa8b4..631cb4284515 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aef97cb9031755422c23cc64f7a089a0fbbcca7a
+refs/heads/master: 979db7542d9c73db0d770110edb31c1252ef6c4a
diff --git a/trunk/fs/autofs/inode.c b/trunk/fs/autofs/inode.c
index 708bdb89fea1..dda510d31f84 100644
--- a/trunk/fs/autofs/inode.c
+++ b/trunk/fs/autofs/inode.c
@@ -54,6 +54,7 @@ void autofs_kill_sb(struct super_block *sb)
 
 static const struct super_operations autofs_sops = {
 	.statfs		= simple_statfs,
+	.show_options	= generic_show_options,
 };
 
 enum {Opt_err, Opt_fd, Opt_uid, Opt_gid, Opt_pgrp, Opt_minproto, Opt_maxproto};
@@ -140,6 +141,8 @@ int autofs_fill_super(struct super_block *s, void *data, int silent)
 	int minproto, maxproto;
 	pid_t pgid;
 
+	save_mount_options(s, data);
+
 	sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
 	if (!sbi)
 		goto fail_unlock;