Fix wng_open error handling.

[paraslash.git] / write_common.c

diff --git a/write_common.c b/write_common.c
index dda60168276e9695b32e1e843b0dd00b64381b7d..a413d47e2dd0d3c75d4ef26f7a630325685c5d14 100644 (file)
--- a/write_common.c
+++ b/write_common.c
@@ -66,7 +66,7 @@ int wng_open(struct writer_node_group *g)
                wn->wng = g;
                ret = wn->writer->open(wn);
                if (ret < 0)
                wn->wng = g;
                ret = wn->writer->open(wn);
                if (ret < 0)

-                       goto out;
+                       goto err_out;

                wn->chunk_bytes = ret;
                g->max_chunk_bytes = PARA_MAX(g->max_chunk_bytes, ret);
                wn->task.pre_select = wn->writer->pre_select;
                wn->chunk_bytes = ret;
                g->max_chunk_bytes = PARA_MAX(g->max_chunk_bytes, ret);
                wn->task.pre_select = wn->writer->pre_select;


@@ -75,9 +75,17 @@ int wng_open(struct writer_node_group *g)
                register_task(&wn->task);
        }
        sprintf(g->task.status, "%s", "writer node group");
                register_task(&wn->task);
        }
        sprintf(g->task.status, "%s", "writer node group");

-       g->eof = 0;

        register_task(&g->task);
        register_task(&g->task);

-out:
+       g->eof = 0;
+       return 1;
+err_out:
+       while (i > 0) {
+               struct writer_node *wn = &g->writer_nodes[--i];
+               unregister_task(&wn->task);
+               wn->writer->close(wn);
+       }
+       g->num_writers = 0;
+       g->eof = 1;

        return ret;
 }
 
        return ret;
 }