Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-6215 llite: make_request_fn returns blk_qc_t in kernel 4.4
[fs/lustre-release.git]
/
lustre
/
utils
/
mount_utils_ldiskfs.c
diff --git
a/lustre/utils/mount_utils_ldiskfs.c
b/lustre/utils/mount_utils_ldiskfs.c
index
2937a1b
..
54b62fe
100644
(file)
--- a/
lustre/utils/mount_utils_ldiskfs.c
+++ b/
lustre/utils/mount_utils_ldiskfs.c
@@
-93,8
+93,11
@@
extern char *progname;
#define DUMMY_FILE_NAME_LEN 25
#define EXT3_DIRENT_SIZE DUMMY_FILE_NAME_LEN
#define DUMMY_FILE_NAME_LEN 25
#define EXT3_DIRENT_SIZE DUMMY_FILE_NAME_LEN
+static void append_unique(char *buf, char *prefix, char *key, char *val,
+ size_t maxbuflen);
+
/*
/*
- * Concatenate context of the temporary mount point if
f
selinux is enabled
+ * Concatenate context of the temporary mount point if selinux is enabled
*/
#ifdef HAVE_SELINUX
static void append_context_for_mount(char *mntpt, struct mkfs_opts *mop)
*/
#ifdef HAVE_SELINUX
static void append_context_for_mount(char *mntpt, struct mkfs_opts *mop)
@@
-109,8
+112,9
@@
static void append_context_for_mount(char *mntpt, struct mkfs_opts *mop)
}
if (fcontext != NULL) {
}
if (fcontext != NULL) {
- strcat(mop->mo_ldd.ldd_mount_opts, ",context=");
- strcat(mop->mo_ldd.ldd_mount_opts, fcontext);
+ append_unique(mop->mo_ldd.ldd_mount_opts,
+ ",", "context", fcontext,
+ sizeof(mop->mo_ldd.ldd_mount_opts));
freecon(fcontext);
}
}
freecon(fcontext);
}
}
@@
-549,8
+553,9
@@
static void append_unique(char *buf, char *prefix, char *key, char *val,
strscat(buf, key, maxbuflen);
if (val != NULL) {
strscat(buf, key, maxbuflen);
if (val != NULL) {
- strscat(buf, "=", maxbuflen);
+ strscat(buf, "=
\"
", maxbuflen);
strscat(buf, val, maxbuflen);
strscat(buf, val, maxbuflen);
+ strscat(buf, "\"", maxbuflen);
}
}
}
}
}
}