diff options
| author | Chris Mason <chris.mason@oracle.com> | 2011-05-23 06:30:52 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-05-23 06:30:52 -0400 |
| commit | 712673339a0d085358fd1cd3a6477cc7979bb69f (patch) | |
| tree | b2e268685e3cbba19a4adb2a47d853e4e461fcfc /fs/btrfs/transaction.c | |
| parent | aa2dfb372a2a647beedac163ce6f8b0fcbefac29 (diff) | |
| parent | 8628764e1a5e1998a42b9713e9edea7753653d01 (diff) | |
| download | blackbird-op-linux-712673339a0d085358fd1cd3a6477cc7979bb69f.tar.gz blackbird-op-linux-712673339a0d085358fd1cd3a6477cc7979bb69f.zip | |
Merge branch 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/arne/btrfs-unstable-arne into inode_numbers
Conflicts:
fs/btrfs/Makefile
fs/btrfs/ctree.h
fs/btrfs/volumes.h
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/transaction.c')
| -rw-r--r-- | fs/btrfs/transaction.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index 33679fc710c6..dc80f7156923 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -1228,6 +1228,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, WARN_ON(cur_trans != trans->transaction); + btrfs_scrub_pause(root); /* btrfs_commit_tree_roots is responsible for getting the * various roots consistent with each other. Every pointer * in the tree of tree roots has to point to the most up to date @@ -1312,6 +1313,8 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, mutex_unlock(&root->fs_info->trans_mutex); + btrfs_scrub_continue(root); + if (current->journal_info == trans) current->journal_info = NULL; |
