Merge commit 'remotes/fml/master'

[paraslash.git] / write_common.c

diff --git a/write_common.c b/write_common.c
index 29a5e532698fb9a6e5c2ce9404cd37c1bd98d985..f9560d7f1ee1050439f16459a6fda786647d9250 100644 (file)
--- a/write_common.c
+++ b/write_common.c
@@ -21,49 +21,43 @@ struct writer writers[NUM_SUPPORTED_WRITERS] = {WRITER_ARRAY};
 
 static void wng_pre_select(__a_unused struct sched *s, struct task *t)
 {
-       struct writer_node_group *g = t->private_data;
+       struct writer_node_group *g = container_of(t, struct writer_node_group, task);
        int i;
 
        FOR_EACH_WRITER_NODE(i, g) {
                struct writer_node *wn = &g->writer_nodes[i];
-               t->ret = wn->writer->pre_select(s, wn);
-               if (t->ret < 0) {
-                       g->error = t->ret;
+               t->error = wn->writer->pre_select(s, wn);
+               if (t->error < 0)
                        return;
-               }
        }
 }
 
 static void wng_post_select(struct sched *s, struct task *t)
 {
-       struct writer_node_group *g = t->private_data;
+       struct writer_node_group *g = container_of(t, struct writer_node_group, task);
        int i;
        size_t min_written = 0;
 
        FOR_EACH_WRITER_NODE(i, g) {
                struct writer_node *wn = &g->writer_nodes[i];
-               t->ret = wn->writer->post_select(s, wn);
-               if (t->ret < 0) {
-                       g->error = t->ret;
+               t->error = wn->writer->post_select(s, wn);
+               if (t->error < 0)
                        return;
-               }
                if (!i)
                        min_written = wn->written;
                else
                        min_written = PARA_MIN(min_written, wn->written);
        }
-//     PARA_INFO_LOG("loaded: %zd, min_written: %zd bytes\n", *g->loaded, min_written);
+       //PARA_INFO_LOG("loaded: %zd, min_written: %zd bytes\n", *g->loaded, min_written);
        if (min_written) {
                *g->loaded -= min_written;
                FOR_EACH_WRITER_NODE(i, g)
                        g->writer_nodes[i].written -= min_written;
        }
        if (!*g->loaded && *g->input_error) {
-               g->error = *g->input_error;
-               t->ret = g->error;
+               t->error = *g->input_error;
                return;
        }
-       t->ret = 1;
        if (*g->loaded && min_written) {
 //             PARA_INFO_LOG("moving %zd bytes\n", *g->loaded);
                memmove(g->buf, g->buf + min_written, *g->loaded);
@@ -96,7 +90,6 @@ int wng_open(struct writer_node_group *g)
                g->max_chunk_bytes = PARA_MAX(g->max_chunk_bytes, ret);
        }
        sprintf(g->task.status, "%s", "writer node group");
-       g->error = 0;
        return 1;
 err_out:
        PARA_ERROR_LOG("%s\n", para_strerror(-ret));
@@ -106,7 +99,6 @@ err_out:
                wn->writer->close(wn);
        }
        g->num_writers = 0;
-       g->error = ret;
        return ret;
 }
 
@@ -156,7 +148,6 @@ struct writer_node_group *wng_new(unsigned num_writers)
        g->num_writers = num_writers;
        g->writer_nodes = para_calloc(num_writers
                * sizeof(struct writer_node));
-       g->task.private_data = g;
        g->task.post_select = wng_post_select;
        g->task.pre_select = wng_pre_select;
        return g;