diff options
| author | Ingo Molnar <[email protected]> | 2017-04-03 14:36:32 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2017-04-03 14:36:32 +0000 |
| commit | 7f75540ff2ca84dbac26cf9deeb620cbf5646f5e (patch) | |
| tree | 1eb54748074d3a91f3dd70fb5d4b23bf713f0bd5 /fs/btrfs/disk-io.c | |
| parent | x86/mm/numa: Remove numa_nodemask_from_meminfo() (diff) | |
| parent | Linux 4.11-rc5 (diff) | |
| download | kernel-7f75540ff2ca84dbac26cf9deeb620cbf5646f5e.tar.gz kernel-7f75540ff2ca84dbac26cf9deeb620cbf5646f5e.zip | |
Merge tag 'v4.11-rc5' into x86/mm, to refresh the branch
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'fs/btrfs/disk-io.c')
| -rw-r--r-- | fs/btrfs/disk-io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 08b74daf35d0..eb1ee7b6f532 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -1342,7 +1342,7 @@ static void __setup_root(struct btrfs_root *root, struct btrfs_fs_info *fs_info, atomic_set(&root->orphan_inodes, 0); atomic_set(&root->refs, 1); atomic_set(&root->will_be_snapshoted, 0); - atomic_set(&root->qgroup_meta_rsv, 0); + atomic64_set(&root->qgroup_meta_rsv, 0); root->log_transid = 0; root->log_transid_committed = -1; root->last_log_commit = 0; |