---

yaml --- r: 84791 b: refs/heads/master c: e55e212 h: refs/heads/master i: 84789: 709dba2 84787: deee30a 84783: 110e2f0 v: v3
git-mirror · Feb 8, 2008 · 40302f1 · 40302f1
1 parent aa27f50
commit 40302f1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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,18 +73,24 @@ 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;
 }
 
 static struct super_operations capifs_sops =
 {
 	.statfs		= simple_statfs,
 	.remount_fs	= capifs_remount,
+	.show_options	= generic_show_options,
 };