Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 979db754 authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Linus Torvalds
Browse files

mount options: fix autofs 



Add a .show_options super operation to autofs.

Use generic_show_options() and save the complete option string in
autofs_fill_super().

Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
Acked-by: default avatarH. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent aef97cb9

fs/autofs/inode.c

+3 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ out_kill_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;