diff options
author | Chris Mason <chris.mason@oracle.com> | 2009-03-12 20:12:45 -0400 |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2009-03-24 16:14:26 -0400 |
commit | b7ec40d7845bffca8bb3af2ea3f192d6257bbe21 (patch) | |
tree | 65b833b979417d36f0fd26d647573de1df0646b9 /fs/btrfs/extent-tree.c | |
parent | c3e69d58e86c3917ae4e9e31b4acf490a7cafe60 (diff) |
Btrfs: reduce stalls during transaction commit
To avoid deadlocks and reduce latencies during some critical operations, some
transaction writers are allowed to jump into the running transaction and make
it run a little longer, while others sit around and wait for the commit to
finish.
This is a bit unfair, especially when the callers that jump in do a bunch
of IO that makes all the others procs on the box wait. This commit
reduces the stalls this produces by pre-reading file extent pointers
during btrfs_finish_ordered_io before the transaction is joined.
It also tunes the drop_snapshot code to politely wait for transactions
that have started writing out their delayed refs to finish. This avoids
new delayed refs being flooded into the queue while we're trying to
close off the transaction.
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/extent-tree.c')
-rw-r--r-- | fs/btrfs/extent-tree.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 3b8b6c212701..a421c32c6cfe 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c | |||
@@ -3797,7 +3797,8 @@ int btrfs_drop_snapshot(struct btrfs_trans_handle *trans, struct btrfs_root | |||
3797 | break; | 3797 | break; |
3798 | if (wret < 0) | 3798 | if (wret < 0) |
3799 | ret = wret; | 3799 | ret = wret; |
3800 | if (trans->transaction->in_commit) { | 3800 | if (trans->transaction->in_commit || |
3801 | trans->transaction->delayed_refs.flushing) { | ||
3801 | ret = -EAGAIN; | 3802 | ret = -EAGAIN; |
3802 | break; | 3803 | break; |
3803 | } | 3804 | } |