Commit 6bf4d781e9d9620779d3fb924037941929e738c9
2011-08-17T14:44:13
Copy the work before returning from creating a thread in case we change the work before copying it.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44
diff --git a/main.c b/main.c
index af16b21..8f2a3ab 100644
--- a/main.c
+++ b/main.c
@@ -3088,7 +3088,7 @@ out:
return ret;
}
-static bool submit_work_sync(struct thr_info *thr, const struct work *work_in)
+static bool submit_work_sync(struct thr_info *thr, struct work *work_in)
{
struct workio_cmd *wc;
@@ -3099,10 +3099,9 @@ static bool submit_work_sync(struct thr_info *thr, const struct work *work_in)
return false;
}
- wc->u.work = make_work();
+ wc->u.work = work_in;
wc->cmd = WC_SUBMIT_WORK;
wc->thr = thr;
- memcpy(wc->u.work, work_in, sizeof(*work_in));
if (opt_debug)
applog(LOG_DEBUG, "Pushing submit work to work thread");
@@ -3121,7 +3120,7 @@ err_out:
struct swa {
struct thr_info *thr;
- const struct work *work_in;
+ struct work *work_in;
};
static void *swasync_thread(void *userdata)
@@ -3146,7 +3145,8 @@ static bool submit_work_async(struct thr_info *thr, const struct work *work_in)
}
swa->thr = thr;
- swa->work_in = work_in;
+ swa->work_in = make_work();
+ memcpy(swa->work_in, work_in, sizeof(struct work));
if (unlikely(pthread_create(&sw_thread, NULL, swasync_thread, (void *)swa))) {
applog(LOG_ERR, "Failed to create swasync_thread");