mount options: fix capifs

Add a .show_options super operation to capifs.

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

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Acked-by: Karsten Keil <kkeil@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 7 insertions, 0 deletions

diff --git a/drivers/isdn/capi/capifs.c b/drivers/isdn/capi/capifs.c
index 2dd1b57b0ba4..6d7c47ec0367 100644
--- a/drivers/isdn/capi/capifs.c
+++ b/drivers/isdn/capi/capifs.c
@@ -52,6 +52,7 @@ static int capifs_remount(struct super_block *s, int *flags, char *data)
         gid_t gid = 0;
         umode_t mode = 0600;
         char *this_char;
+        char *new_opt = kstrdup(data, GFP_KERNEL);
 
         this_char = NULL;
         while ((this_char = strsep(&data, ",")) != NULL) {
@@ -72,11 +73,16 @@ static int capifs_remount(struct super_block *s, int *flags, char *data)
                         return -EINVAL;
                 }
         }
+
+        kfree(s->s_options);
+        s->s_options = new_opt;
+
         config.setuid  = setuid;
         config.setgid  = setgid;
         config.uid     = uid;
         config.gid     = gid;
         config.mode    = mode;
+
         return 0;
 }
 
@@ -84,6 +90,7 @@ static struct super_operations capifs_sops =
 {
         .statfs         = simple_statfs,
         .remount_fs     = capifs_remount,
+        .show_options   = generic_show_options,
 };