[sheepdog-users] [PATCH stable-0.8 06/22] sheep: save dw->finish_fd to local variable

[Hitoshi Mitake]

From: MORITA Kazutaka <morita.kazutaka at lab.ntt.co.jp>

We cannot access dw after we call delete_vdis_done() because it may be
already freed.

Signed-off-by: MORITA Kazutaka <morita.kazutaka at lab.ntt.co.jp>
Reviewed-by: Hitoshi Mitake <mitake.hitoshi at lab.ntt.co.jp>
---
 sheep/vdi.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sheep/vdi.c b/sheep/vdi.c
index 7e3eaa6..68de273 100644
--- a/sheep/vdi.c
+++ b/sheep/vdi.c
@@ -1031,7 +1031,7 @@ static uint64_t get_vdi_root(uint32_t vid, bool *cloned)
 static int start_deletion(struct request *req, uint32_t vid)
 {
 	struct deletion_work *dw = NULL;
-	int ret = SD_RES_SUCCESS;
+	int ret = SD_RES_SUCCESS, finish_fd;
 	bool cloned;
 	uint32_t root_vid;
 
@@ -1039,7 +1039,7 @@ static int start_deletion(struct request *req, uint32_t vid)
 	dw->delete_vid_array = xzalloc(SD_INODE_SIZE - SD_INODE_HEADER_SIZE);
 	dw->delete_vid_count = 0;
 	dw->target_vid = vid;
-	dw->finish_fd = eventfd(0, 0);
+	finish_fd = dw->finish_fd = eventfd(0, 0);
 	if (dw->finish_fd < 0) {
 		sd_err("cannot create an eventfd for notifying finish of"
 		       " deletion info: %m");
@@ -1088,8 +1088,8 @@ static int start_deletion(struct request *req, uint32_t vid)
 	 * the event fd is written by delete_one_vdi_done(), when all vdis of
 	 * deletion_work are deleted
 	 */
-	eventfd_xread(dw->finish_fd);
-	close(dw->finish_fd);
+	eventfd_xread(finish_fd);
+	close(finish_fd);
 
 	return ret;
 out:
-- 
1.7.10.4