External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-25 15:15:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set specific flags for glusterfs fs mounts

Browse Source 
* src/storage_backend_fs.c: due to Fuse O_DIRECT problem one need
  to mount glusterfs with direct-IO mode, until fixed
This commit is contained in:
Harshavardhana 2009-07-21 17:49:20 +02:00 committed by Daniel Veillard
parent e1506cb4eb
commit 44948f5b69
1 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/storage_backend_fs.c
View File

@ -598,6 +598,7 @@ static int
virStorageBackendFileSystemMount(virConnectPtr conn, virStorageBackendFileSystemMount(virConnectPtr conn,
virStoragePoolObjPtr pool) { virStoragePoolObjPtr pool) {
char *src; char *src;
char *options;
const char **mntargv; const char **mntargv;
/* 'mount -t auto' doesn't seem to auto determine nfs (or cifs), /* 'mount -t auto' doesn't seem to auto determine nfs (or cifs),
@ -605,6 +606,10 @@ virStorageBackendFileSystemMount(virConnectPtr conn,
* accommodate this */ * accommodate this */
int netauto = (pool->def->type == VIR_STORAGE_POOL_NETFS && int netauto = (pool->def->type == VIR_STORAGE_POOL_NETFS &&
pool->def->source.format == VIR_STORAGE_POOL_NETFS_AUTO); pool->def->source.format == VIR_STORAGE_POOL_NETFS_AUTO);
int glusterfs = (pool->def->type == VIR_STORAGE_POOL_NETFS &&
pool->def->source.format == VIR_STORAGE_POOL_NETFS_GLUSTERFS);
int option_index;
int source_index; int source_index;
const char *netfs_auto_argv[] = { const char *netfs_auto_argv[] = {
@ -626,9 +631,26 @@ virStorageBackendFileSystemMount(virConnectPtr conn,
NULL, NULL,
}; };
const char *glusterfs_argv[] = {
MOUNT,
"-t",
pool->def->type == VIR_STORAGE_POOL_FS ?
virStoragePoolFormatFileSystemTypeToString(pool->def->source.format) :
virStoragePoolFormatFileSystemNetTypeToString(pool->def->source.format),
NULL,
"-o",
NULL,
pool->def->target.path,
NULL,
};
if (netauto) { if (netauto) {
mntargv = netfs_auto_argv; mntargv = netfs_auto_argv;
source_index = 1; source_index = 1;
} else if (glusterfs) {
mntargv = glusterfs_argv;
source_index = 3;
option_index = 5;
} else { } else {
mntargv = fs_argv; mntargv = fs_argv;
source_index = 3; source_index = 3;
@ -664,6 +686,12 @@ virStorageBackendFileSystemMount(virConnectPtr conn,
} }
if (pool->def->type == VIR_STORAGE_POOL_NETFS) { if (pool->def->type == VIR_STORAGE_POOL_NETFS) {
if (pool->def->source.format = VIR_STORAGE_POOL_NETFS_GLUSTERFS) {
if (virAsprintf(&options, "direct-io-mode=1") == -1) {
virReportOOMError(conn);
return -1;
}
}
if (virAsprintf(&src, "%s:%s", if (virAsprintf(&src, "%s:%s",
pool->def->source.host.name, pool->def->source.host.name,
pool->def->source.dir) == -1) { pool->def->source.dir) == -1) {
@ -679,6 +707,10 @@ virStorageBackendFileSystemMount(virConnectPtr conn,
} }
mntargv[source_index] = src; mntargv[source_index] = src;
if (glusterfs) {
mntargv[option_index] = options;
}
if (virRun(conn, mntargv, NULL) < 0) { if (virRun(conn, mntargv, NULL) < 0) {
VIR_FREE(src); VIR_FREE(src);
return -1; return -1;