diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-30 19:46:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-30 19:46:48 -0400 |
| commit | ec6a8679fa8ce977c8b7f86238455b494699de74 (patch) | |
| tree | d06401567f67cd757ddf358168bdf574cb4b94f5 /fs/btrfs/transaction.h | |
| parent | db06816cb9ceb21a2bf24122407b7b4fe419c3fc (diff) | |
| parent | f36f3042eae238bdaefe7c79310afe573bfc3622 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: be more polite in the async caching threads
Btrfs: preserve commit_root for async caching
Diffstat (limited to 'fs/btrfs/transaction.h')
| -rw-r--r-- | fs/btrfs/transaction.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/btrfs/transaction.h b/fs/btrfs/transaction.h index 961c3ee5a2e1..663c67404918 100644 --- a/fs/btrfs/transaction.h +++ b/fs/btrfs/transaction.h | |||
| @@ -107,4 +107,5 @@ int btrfs_record_root_in_trans(struct btrfs_trans_handle *trans, | |||
| 107 | struct btrfs_root *root); | 107 | struct btrfs_root *root); |
| 108 | int btrfs_write_and_wait_marked_extents(struct btrfs_root *root, | 108 | int btrfs_write_and_wait_marked_extents(struct btrfs_root *root, |
| 109 | struct extent_io_tree *dirty_pages); | 109 | struct extent_io_tree *dirty_pages); |
| 110 | int btrfs_transaction_in_commit(struct btrfs_fs_info *info); | ||
| 110 | #endif | 111 | #endif |