From 40302f12b227ee26890dd983b98b89f354e4d099 Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <mszeredi@suse.cz>
Date: Fri, 8 Feb 2008 04:21:40 -0800
Subject: [PATCH] --- yaml --- r: 84791 b: refs/heads/master c:
 e55e212c083f0c51a7d4eccd1746b6dca40ffc41 h: refs/heads/master i:   84789:
 709dba270f3b30fa552aa0b999ca74adb4b1203e   84787:
 deee30a6a3ebe11099ed519b81ad6098297339e9   84783:
 110e2f0690a6df0109b629840d5efaf2f839f422 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/isdn/capi/capifs.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a1034541786f..2383b5646116 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 552c3c6c565d08857df48e77e8ce2b223517c3ee
+refs/heads/master: e55e212c083f0c51a7d4eccd1746b6dca40ffc41
diff --git a/trunk/drivers/isdn/capi/capifs.c b/trunk/drivers/isdn/capi/capifs.c
index 2dd1b57b0ba4..6d7c47ec0367 100644
--- a/trunk/drivers/isdn/capi/capifs.c
+++ b/trunk/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,
 };