diff options
| author | Chris Mason <chris.mason@oracle.com> | 2009-10-14 09:38:28 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2009-10-14 10:32:50 -0400 |
| commit | 444528b3e614f7f2391488d9bca8e0b872db909b (patch) | |
| tree | 5326be87610ed3fc7a14d0f28e96e5e22207cf5f | |
| parent | 0634857488ec6e28fa22920cd0bee3c2ac07ccfd (diff) | |
| download | op-kernel-dev-444528b3e614f7f2391488d9bca8e0b872db909b.zip op-kernel-dev-444528b3e614f7f2391488d9bca8e0b872db909b.tar.gz | |
Btrfs: always pin metadata in discard mode
We have an optimization in btrfs to allow blocks to be
immediately freed if they were allocated in this transaction and never
written. Otherwise they are pinned and freed when the transaction
commits.
This isn't optimal for discard mode because immediately freeing
them means immediately discarding them. It is better to give the
block to the pinning code and letting the (slow) discard happen later.
Signed-off-by: Chris Mason <chris.mason@oracle.com>
| -rw-r--r-- | fs/btrfs/extent-tree.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index d4a3528..c56f916 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -3686,6 +3686,14 @@ static int pin_down_bytes(struct btrfs_trans_handle *trans, if (is_data) goto pinit; + /* + * discard is sloooow, and so triggering discards on + * individual btree blocks isn't a good plan. Just + * pin everything in discard mode. + */ + if (btrfs_test_opt(root, DISCARD)) + goto pinit; + buf = btrfs_find_tree_block(root, bytenr, num_bytes); if (!buf) goto pinit; |
