From 16f51cd98c56bcc61209d7cbbc4061bbd3aa8e5b Mon Sep 17 00:00:00 2001 From: Raghavendra G Date: Fri, 20 Jan 2017 16:09:13 +0530 Subject: performance/write-behind: access stub only if available during statedump >Change-Id: Ia5dd718458a5e32138012f81f014d13fc6b28be2 >BUG: 1415115 >Signed-off-by: Raghavendra G >Reviewed-on: https://review.gluster.org/16440 >Reviewed-by: N Balachandran >NetBSD-regression: NetBSD Build System >CentOS-regression: Gluster Build System >Smoke: Gluster Build System Change-Id: Ia5dd718458a5e32138012f81f014d13fc6b28be2 BUG: 1418623 Signed-off-by: Raghavendra G (cherry picked from commit 85d7f1d1ee24ac400d4aa223478727643532693a) Reviewed-on: https://review.gluster.org/16519 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Shyamsundar Ranganathan --- .../performance/write-behind/src/write-behind.c | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'xlators') diff --git a/xlators/performance/write-behind/src/write-behind.c b/xlators/performance/write-behind/src/write-behind.c index cf8dd1f9e00..2405c24e517 100644 --- a/xlators/performance/write-behind/src/write-behind.c +++ b/xlators/performance/write-behind/src/write-behind.c @@ -393,10 +393,10 @@ __wb_request_unref (wb_request_t *req) list_del_init (&req->winds); list_del_init (&req->unwinds); - if (req->stub && req->ordering.tempted) { + if (req->stub) { call_stub_destroy (req->stub); req->stub = NULL; - } /* else we would have call_resume()'ed */ + } if (req->iobref) iobref_unref (req->iobref); @@ -1660,21 +1660,20 @@ __wb_pick_winds (wb_inode_t *wb_inode, list_head_t *tasks, void wb_do_winds (wb_inode_t *wb_inode, list_head_t *tasks) { - wb_request_t *req = NULL; - wb_request_t *tmp = NULL; + wb_request_t *req = NULL; + wb_request_t *tmp = NULL; list_for_each_entry_safe (req, tmp, tasks, winds) { - list_del_init (&req->winds); + list_del_init (&req->winds); if (req->op_ret == -1) { - call_unwind_error (req->stub, req->op_ret, - req->op_errno); + call_unwind_error_keep_stub (req->stub, req->op_ret, + req->op_errno); } else { - call_resume (req->stub); + call_resume_keep_stub (req->stub); } - req->stub = NULL; - wb_request_unref (req); + wb_request_unref (req); } } @@ -2815,8 +2814,9 @@ __wb_dump_requests (struct list_head *head, char *prefix) gf_proc_dump_write ("size", "%"GF_PRI_SIZET, req->write_size); - gf_proc_dump_write ("offset", "%"PRId64, - req->stub->args.offset); + if (req->stub) + gf_proc_dump_write ("offset", "%"PRId64, + req->stub->args.offset); flag = req->ordering.lied; gf_proc_dump_write ("lied", "%d", flag); -- cgit