diff options
| author | Adam Buchbinder <abuchbinder@google.com> | 2017-07-12 13:05:38 -0700 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-07-20 17:43:43 +0200 |
| commit | 1639cc2a511cb6f2a40b706b3c41e5cb4e01b809 (patch) | |
| tree | faad6cb5fcf001a2b624d1c4895463a3cb286e9e /convert/source-fs.h | |
| parent | 0544aafcbf48a8b70090cc515b9d130bac10554e (diff) | |
btrfs-progs: convert: Fix data race when reporting progress
The status display was reading the state while the task was updating
it. Use a mutex to prevent the race.
This race was detected using ThreadSanitizer and
misc-tests/005-convert-progress-thread-crash.
==================
WARNING: ThreadSanitizer: data race
Write of size 8 by main thread:
#0 ext2_copy_inodes btrfs-progs/convert/source-ext2.c:853
#1 copy_inodes btrfs-progs/convert/main.c:145
#2 do_convert btrfs-progs/convert/main.c:1297
#3 main btrfs-progs/convert/main.c:1924
Previous read of size 8 by thread T1:
#0 print_copied_inodes btrfs-progs/convert/main.c:124
Location is stack of main thread.
Thread T1 (running) created by main thread at:
#0 pthread_create <null>
#1 task_start btrfs-progs/task-utils.c:50
#2 do_convert btrfs-progs/convert/main.c:1295
#3 main btrfs-progs/convert/main.c:1924
SUMMARY: ThreadSanitizer: data race
btrfs-progs/convert/source-ext2.c:853 in ext2_copy_inodes
Signed-off-by: Adam Buchbinder <abuchbinder@google.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'convert/source-fs.h')
| -rw-r--r-- | convert/source-fs.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/convert/source-fs.h b/convert/source-fs.h index ca32d159..3a6fa46c 100644 --- a/convert/source-fs.h +++ b/convert/source-fs.h @@ -18,6 +18,8 @@ #define __BTRFS_CONVERT_SOURCE_FS_H__ #include "kerncompat.h" +#include <pthread.h> + #define CONV_IMAGE_SUBVOL_OBJECTID BTRFS_FIRST_FREE_OBJECTID @@ -37,6 +39,7 @@ extern const struct simple_range btrfs_reserved_ranges[3]; struct task_info; struct task_ctx { + pthread_mutex_t mutex; u64 max_copy_inodes; u64 cur_copy_inodes; struct task_info *info; |