Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=e55e212c083f0c51a7d4eccd1746b6dca40ffc41
Commit:     e55e212c083f0c51a7d4eccd1746b6dca40ffc41
Parent:     552c3c6c565d08857df48e77e8ce2b223517c3ee
Author:     Miklos Szeredi <[EMAIL PROTECTED]>
AuthorDate: Fri Feb 8 04:21:40 2008 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Fri Feb 8 09:22:40 2008 -0800

    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 <[EMAIL PROTECTED]>
    Acked-by: Karsten Keil <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 drivers/isdn/capi/capifs.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drivers/isdn/capi/capifs.c b/drivers/isdn/capi/capifs.c
index 2dd1b57..6d7c47e 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,
 };
 
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to