btrfs-progs: resst info->periodic.timer_fd's value after free
authorZhao Lei <zhaolei@cn.fujitsu.com>
Mon, 27 Jul 2015 12:24:29 +0000 (20:24 +0800)
committerDavid Sterba <dsterba@suse.com>
Mon, 31 Aug 2015 17:25:10 +0000 (19:25 +0200)
task_period_stop() is used to close a timer explicitly, to avoid
the timer handle closed again by task_stop(), we should reset its
value after close.

Also add value-reset for info->id for safe.

Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
task-utils.c

index 17fd573..768be94 100644 (file)
@@ -64,10 +64,13 @@ void task_stop(struct task_info *info)
        if (info->id > 0) {
                pthread_cancel(info->id);
                pthread_join(info->id, NULL);
+               info->id = -1;
        }
 
-       if (info->periodic.timer_fd)
+       if (info->periodic.timer_fd) {
                close(info->periodic.timer_fd);
+               info->periodic.timer_fd = 0;
+       }
 
        if (info->postfn)
                info->postfn(info->private_data);
@@ -130,5 +133,6 @@ void task_period_stop(struct task_info *info)
        if (info->periodic.timer_fd) {
                timerfd_settime(info->periodic.timer_fd, 0, NULL, NULL);
                close(info->periodic.timer_fd);
+               info->periodic.timer_fd = -1;
        }
 }