diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-01 03:58:48 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-04-01 03:58:48 +0300 |
| commit | fe8e12b5032536d37751c47e1c0446f17e974e5c (patch) | |
| tree | 279c47182394244da6fd87a33031117dd459bbe1 /fs/btrfs/ctree.h | |
| parent | f9799ad21b5e4a41633f54dfab407ebb37abbd8a (diff) | |
| parent | 41a75a6eb2bf4e75e0d93862171bebb3ca4efec7 (diff) | |
| download | linux-fe8e12b5032536d37751c47e1c0446f17e974e5c.tar.xz | |
Merge branch 'for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"We have three small fixes queued up in my for-linus-4.11 branch"
* 'for-linus-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: fix an integer overflow check
btrfs: Change qgroup_meta_rsv to 64bit
Btrfs: bring back repair during read
Diffstat (limited to 'fs/btrfs/ctree.h')
| -rw-r--r-- | fs/btrfs/ctree.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 29b7fc28c607..c4115901d906 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -1259,7 +1259,7 @@ struct btrfs_root { atomic_t will_be_snapshoted; /* For qgroup metadata space reserve */ - atomic_t qgroup_meta_rsv; + atomic64_t qgroup_meta_rsv; }; static inline u32 btrfs_inode_sectorsize(const struct inode *inode) { |