summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2010-02-19 14:13:50 -0800
committerChris Mason <chris.mason@oracle.com>2010-03-15 11:00:11 -0400
commit0bdb1db297ab36865a63ee722d35ff0a1f0ae522 (patch)
treebd30183300d2ceaa35db1ab59adacf89e8e19d1a /fs
parentbd4d10888990f7e3f8029205d27eb155202d6969 (diff)
downloadlinux-3.10-0bdb1db297ab36865a63ee722d35ff0a1f0ae522.tar.gz
linux-3.10-0bdb1db297ab36865a63ee722d35ff0a1f0ae522.tar.bz2
linux-3.10-0bdb1db297ab36865a63ee722d35ff0a1f0ae522.zip
Btrfs: flush data on snapshot creation
Flush any delalloc extents when we create a snapshot, so that recently written file data is always included in the snapshot. A later commit will add the ability to snapshot without the flush, but most people expect flushing. Signed-off-by: Sage Weil <sage@newdream.net> Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/transaction.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 2a36e236a49..2d654c1c794 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -997,13 +997,10 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
mutex_unlock(&root->fs_info->trans_mutex);
- if (flush_on_commit) {
+ if (flush_on_commit || snap_pending) {
btrfs_start_delalloc_inodes(root, 1);
ret = btrfs_wait_ordered_extents(root, 0, 1);
BUG_ON(ret);
- } else if (snap_pending) {
- ret = btrfs_wait_ordered_extents(root, 0, 1);
- BUG_ON(ret);
}
/*