nfsd4: lookup up callback cred only once

[safe/jmp/linux-2.6] / fs / hfsplus / options.c

diff --git a/fs/hfsplus/options.c b/fs/hfsplus/options.c
index dc64fac..3fcbb0e 100644 (file)
--- a/fs/hfsplus/options.c
+++ b/fs/hfsplus/options.c
@@ -25,7 +25,7 @@ enum {
        opt_force, opt_err
 };
 
-static match_table_t tokens = {
+static const match_table_t tokens = {
        { opt_creator, "creator=%s" },
        { opt_type, "type=%s" },
        { opt_umask, "umask=%o" },
@@ -48,9 +48,9 @@ void hfsplus_fill_defaults(struct hfsplus_sb_info *opts)
 
        opts->creator = HFSPLUS_DEF_CR_TYPE;
        opts->type = HFSPLUS_DEF_CR_TYPE;
-       opts->umask = current->fs->umask;
-       opts->uid = current->uid;
-       opts->gid = current->gid;
+       opts->umask = current_umask();
+       opts->uid = current_uid();
+       opts->gid = current_gid();
        opts->part = -1;
        opts->session = -1;
 }
@@ -132,7 +132,8 @@ int hfsplus_parse_options(char *input, struct hfsplus_sb_info *sbi)
                                return 0;
                        }
                        p = match_strdup(&args[0]);
-                       sbi->nls = load_nls(p);
+                       if (p)
+                               sbi->nls = load_nls(p);
                        if (!sbi->nls) {
                                printk(KERN_ERR "hfs: unable to load nls mapping \"%s\"\n", p);
                                kfree(p);