summaryrefslogtreecommitdiffstats
path: root/glusterfsd
diff options
context:
space:
mode:
authorCsaba Henk <csaba@gluster.com>2010-07-21 17:17:09 +0000
committerAnand V. Avati <avati@dev.gluster.com>2010-07-22 01:55:50 -0700
commitc907de75c8f957700ebe52dea980bda5d551f438 (patch)
tree368b0c3bfbaffc1ba5e92d386365d3c86c99ec0a /glusterfsd
parentd4a56de8bba96a150a0a59593187a317476a7b80 (diff)
glusterfsd: ban specifying fuse in volfile
"fuse-in-volfile" was defunct anyway -- it resulted in a broken mount which had all calls hang on it. So the challenge was either to fix it or remove it. It got thumbs down. Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Anand V. Avati <avati@dev.gluster.com> BUG: 971 (dynamic volume management) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=971
Diffstat (limited to 'glusterfsd')
-rw-r--r--glusterfsd/src/glusterfsd.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c
index 2350b5b059e..bf6959e34cf 100644
--- a/glusterfsd/src/glusterfsd.c
+++ b/glusterfsd/src/glusterfsd.c
@@ -1150,6 +1150,7 @@ glusterfs_process_volfp (glusterfs_ctx_t *ctx, FILE *fp)
{
glusterfs_graph_t *graph = NULL;
int ret = 0;
+ xlator_t *trav = NULL;
graph = glusterfs_graph_construct (fp);
@@ -1158,6 +1159,16 @@ glusterfs_process_volfp (glusterfs_ctx_t *ctx, FILE *fp)
goto out;
}
+ for (trav = graph->first; trav; trav = trav->next) {
+ if (strcmp (trav->type, "mount/fuse") == 0) {
+ gf_log ("glusterfsd", GF_LOG_ERROR,
+ "fuse xlator cannot be specified "
+ "in volume file");
+ ret = -1;
+ goto out;
+ }
+ }
+
ret = glusterfs_graph_prepare (graph, ctx);
if (ret) {