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-ext2.c | |
| 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-ext2.c')
| -rw-r--r-- | convert/source-ext2.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/convert/source-ext2.c b/convert/source-ext2.c index c6f9f28e..24744e22 100644 --- a/convert/source-ext2.c +++ b/convert/source-ext2.c @@ -18,6 +18,7 @@ #include "kerncompat.h" #include <linux/limits.h> +#include <pthread.h> #include "disk-io.h" #include "transaction.h" #include "utils.h" @@ -850,7 +851,9 @@ static int ext2_copy_inodes(struct btrfs_convert_context *cctx, ret = ext2_copy_single_inode(trans, root, objectid, ext2_fs, ext2_ino, &ext2_inode, convert_flags); + pthread_mutex_lock(&p->mutex); p->cur_copy_inodes++; + pthread_mutex_unlock(&p->mutex); if (ret) return ret; if (trans->blocks_used >= 4096) { |