diff options
| author | Chris Mason <clm@fb.com> | 2017-03-29 23:10:25 +0300 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2017-03-29 23:10:25 +0300 |
| commit | 41a75a6eb2bf4e75e0d93862171bebb3ca4efec7 (patch) | |
| tree | a1ebc64a816a1da2a67e01d928582b41eb48a611 /fs/btrfs/disk-io.c | |
| parent | e1699d2d7bf6e6cce3e1baff19f9dd4595a58664 (diff) | |
| parent | 457ae7268b29c33dee1c0feb143a15f6029d177b (diff) | |
| download | linux-41a75a6eb2bf4e75e0d93862171bebb3ca4efec7.tar.xz | |
Merge branch 'for-chris-4.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.11
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 73fdc6bdaea9..982c56f79515 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; |