diff options
| author | koverstreet <kent.overstreet@gmail.com> | 2018-11-05 00:24:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-05 00:24:14 -0500 |
| commit | ff2a414ccc6300c704989f4ee030f0874083b801 (patch) | |
| tree | 4b06d971db49c2992c7ced11be0f73a95f0d5ad3 /libbcachefs/extents.c | |
| parent | db8cffeaed01c917863d3f12b0203615a303ab8e (diff) | |
| parent | 770d75e7e543f1b8060805b602cce589e1072976 (diff) | |
Merge pull request #12 from modelrockettier/real_mount_time
Set the last mount time using the realtime clock
Diffstat (limited to 'libbcachefs/extents.c')
| -rw-r--r-- | libbcachefs/extents.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libbcachefs/extents.c b/libbcachefs/extents.c index ef36d24..5c48d2d 100644 --- a/libbcachefs/extents.c +++ b/libbcachefs/extents.c @@ -235,7 +235,7 @@ unsigned bch2_extent_is_compressed(struct bkey_s_c k) if (!p.ptr.cached && p.crc.compression_type != BCH_COMPRESSION_NONE && p.crc.compressed_size < p.crc.live_size) - ret = max_t(unsigned, ret, p.crc.compressed_size); + ret += p.crc.compressed_size; } } @@ -1275,8 +1275,7 @@ bch2_extent_can_insert(struct btree_insert *trans, switch (bch2_disk_reservation_add(trans->c, trans->disk_res, - sectors * bch2_extent_nr_dirty_ptrs(k), - flags)) { + sectors, flags)) { case 0: break; case -ENOSPC: |