diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-12 18:37:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-12 18:37:04 -0700 |
| commit | d6cf853d4d73c268fc8920ac4e812ee26a12847c (patch) | |
| tree | c909145638eb5c4897ea7e424759eb9b564ebe18 /fs/btrfs/volumes.c | |
| parent | 6a945f38be5f2c198853069a336c887a51d1a238 (diff) | |
| parent | 9f680ce04ea19dabbbafe01b57b61930a9b70741 (diff) | |
| download | linux-3.10-d6cf853d4d73c268fc8920ac4e812ee26a12847c.tar.gz linux-3.10-d6cf853d4d73c268fc8920ac4e812ee26a12847c.tar.bz2 linux-3.10-d6cf853d4d73c268fc8920ac4e812ee26a12847c.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: make sure the chunk allocator doesn't create zero length chunks
Btrfs: fix data enospc check overflow
Diffstat (limited to 'fs/btrfs/volumes.c')
| -rw-r--r-- | fs/btrfs/volumes.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index aa7dc36dac7..8db7b14bbae 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -2250,6 +2250,12 @@ again: if (!looped) calc_size = max_t(u64, min_stripe_size, calc_size); + /* + * we're about to do_div by the stripe_len so lets make sure + * we end up with something bigger than a stripe + */ + calc_size = max_t(u64, calc_size, stripe_len * 4); + do_div(calc_size, stripe_len); calc_size *= stripe_len; |