From c907de75c8f957700ebe52dea980bda5d551f438 Mon Sep 17 00:00:00 2001 From: Csaba Henk Date: Wed, 21 Jul 2010 17:17:09 +0000 Subject: 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 Signed-off-by: Anand V. Avati BUG: 971 (dynamic volume management) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=971 --- glusterfsd/src/glusterfsd.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'glusterfsd') diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c index 2350b5b05..bf6959e34 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) { -- cgit