diff options
| author | Chris Mason <clm@fb.com> | 2015-03-25 13:52:48 -0400 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-03-25 13:52:48 -0400 |
| commit | fc4c3c872f44bf425963feba57eb9c3f8ac2d7eb (patch) | |
| tree | 0d49c3e4d8f64a4cc0d3f42f37430fc60007e28b /fs/btrfs/scrub.c | |
| parent | 9deed229fa8a83bb5cd713b2d2a8e5c022a4b45b (diff) | |
| parent | a4f3d2c4efe2628329249b64fd5799468e025b9d (diff) | |
Merge branch 'cleanups-post-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.1
Signed-off-by: Chris Mason <clm@fb.com>
Conflicts:
fs/btrfs/disk-io.c
Diffstat (limited to 'fs/btrfs/scrub.c')
| -rw-r--r-- | fs/btrfs/scrub.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index 34e6499ba5a4..ab5811545a98 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c | |||
| @@ -3560,7 +3560,7 @@ static noinline_for_stack int scrub_workers_get(struct btrfs_fs_info *fs_info, | |||
| 3560 | int is_dev_replace) | 3560 | int is_dev_replace) |
| 3561 | { | 3561 | { |
| 3562 | int ret = 0; | 3562 | int ret = 0; |
| 3563 | int flags = WQ_FREEZABLE | WQ_UNBOUND; | 3563 | unsigned int flags = WQ_FREEZABLE | WQ_UNBOUND; |
| 3564 | int max_active = fs_info->thread_pool_size; | 3564 | int max_active = fs_info->thread_pool_size; |
| 3565 | 3565 | ||
| 3566 | if (fs_info->scrub_workers_refcnt == 0) { | 3566 | if (fs_info->scrub_workers_refcnt == 0) { |