diff options
author | Chris Mason <chris.mason@oracle.com> | 2008-07-17 12:54:14 -0400 |
---|---|---|
committer | Chris Mason <chris.mason@oracle.com> | 2008-09-25 11:04:04 -0400 |
commit | f9295749388f82c8d2f485e99c72cd7c7876a99b (patch) | |
tree | 5089b0f723583d262116775b8b9fb5b4b8d291e0 /fs/btrfs/disk-io.c | |
parent | dbe674a99c8af088faa4c95eddaeb271a3140ab6 (diff) |
btrfs_start_transaction: wait for commits in progress to finish
btrfs_commit_transaction has to loop waiting for any writers in the
transaction to finish before it can proceed. btrfs_start_transaction
should be polite and not join a transaction that is in the process
of being finished off.
There are a few places that can't wait, basically the ones doing IO that
might be needed to finish the transaction. For them, btrfs_join_transaction
is added.
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/disk-io.c')
-rw-r--r-- | fs/btrfs/disk-io.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 66466d125c05..99bb385c2982 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
@@ -1291,6 +1291,7 @@ struct btrfs_root *open_ctree(struct super_block *sb, | |||
1291 | mutex_init(&fs_info->cleaner_mutex); | 1291 | mutex_init(&fs_info->cleaner_mutex); |
1292 | mutex_init(&fs_info->volume_mutex); | 1292 | mutex_init(&fs_info->volume_mutex); |
1293 | init_waitqueue_head(&fs_info->transaction_throttle); | 1293 | init_waitqueue_head(&fs_info->transaction_throttle); |
1294 | init_waitqueue_head(&fs_info->transaction_wait); | ||
1294 | 1295 | ||
1295 | #if 0 | 1296 | #if 0 |
1296 | ret = add_hasher(fs_info, "crc32c"); | 1297 | ret = add_hasher(fs_info, "crc32c"); |