leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mount options: fix capifs

Browse Source 
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>
This commit is contained in:
Miklos Szeredi 2008-02-08 04:21:40 -08:00 committed by Linus Torvalds
parent 552c3c6c56
commit e55e212c08
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/isdn/capi/capifs.c
View File

@ -52,6 +52,7 @@ static int capifs_remount(struct super_block *s, int *flags, char *data)
gid_t gid = 0; gid_t gid = 0;
umode_t mode = 0600; umode_t mode = 0600;
char *this_char; char *this_char;
char *new_opt = kstrdup(data, GFP_KERNEL);
this_char = NULL; this_char = NULL;
while ((this_char = strsep(&data, ",")) != 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; return -EINVAL;
} }
} }
kfree(s->s_options);
s->s_options = new_opt;
config.setuid = setuid; config.setuid = setuid;
config.setgid = setgid; config.setgid = setgid;
config.uid = uid; config.uid = uid;
config.gid = gid; config.gid = gid;
config.mode = mode; config.mode = mode;
return 0; return 0;
} }
@ -84,6 +90,7 @@ static struct super_operations capifs_sops =
{ {
.statfs = simple_statfs, .statfs = simple_statfs,
.remount_fs = capifs_remount, .remount_fs = capifs_remount,
.show_options = generic_show_options,
}; };