From 2b67b6abf82a80ce3204efa8c1a04f47091a8895 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 24 Jul 2009 13:17:44 -0400 Subject: [PATCH] --- yaml --- r: 155923 b: refs/heads/master c: ebecd3d9d2adba144c15f1d35c78e0c26ead1bfd h: refs/heads/master i: 155921: ed797a13ae2314aab667297cc1287e2eee44bed3 155919: e7be2218b4cb6c793da6b72047102ac3515e0009 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/transaction.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 25a0d2070d1c..901f90ad98cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d717aa1d31c36cb56059e97966cb76f0be021969 +refs/heads/master: ebecd3d9d2adba144c15f1d35c78e0c26ead1bfd diff --git a/trunk/fs/btrfs/transaction.c b/trunk/fs/btrfs/transaction.c index 32454d1c566f..e51d2bc532f8 100644 --- a/trunk/fs/btrfs/transaction.c +++ b/trunk/fs/btrfs/transaction.c @@ -942,9 +942,11 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, mutex_unlock(&root->fs_info->trans_mutex); - if (flush_on_commit || snap_pending) { - if (flush_on_commit) - btrfs_start_delalloc_inodes(root); + if (flush_on_commit) { + btrfs_start_delalloc_inodes(root); + ret = btrfs_wait_ordered_extents(root, 0); + BUG_ON(ret); + } else if (snap_pending) { ret = btrfs_wait_ordered_extents(root, 1); BUG_ON(ret); }