Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
fs
/
btrfs
/
disk-io.c
diff --git
a/kernel/fs/btrfs/disk-io.c
b/kernel/fs/btrfs/disk-io.c
index
41fb431
..
85b207d
100644
(file)
--- a/
kernel/fs/btrfs/disk-io.c
+++ b/
kernel/fs/btrfs/disk-io.c
@@
-2276,6
+2276,7
@@
static void btrfs_init_qgroup(struct btrfs_fs_info *fs_info)
fs_info->quota_enabled = 0;
fs_info->pending_quota_state = 0;
fs_info->qgroup_ulist = NULL;
fs_info->quota_enabled = 0;
fs_info->pending_quota_state = 0;
fs_info->qgroup_ulist = NULL;
+ fs_info->qgroup_rescan_running = false;
mutex_init(&fs_info->qgroup_rescan_lock);
}
mutex_init(&fs_info->qgroup_rescan_lock);
}
@@
-3811,7
+3812,7
@@
void close_ctree(struct btrfs_root *root)
smp_mb();
/* wait for the qgroup rescan worker to stop */
smp_mb();
/* wait for the qgroup rescan worker to stop */
- btrfs_qgroup_wait_for_completion(fs_info);
+ btrfs_qgroup_wait_for_completion(fs_info
, false
);
/* wait for the uuid_scan task to finish */
down(&fs_info->uuid_tree_rescan_sem);
/* wait for the uuid_scan task to finish */
down(&fs_info->uuid_tree_rescan_sem);