diff options
| author | Chris Mason <clm@fb.com> | 2014-11-25 08:45:30 -0500 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2014-11-25 08:45:30 -0500 |
| commit | ad27c0dab76a7abc8809ec41ae59cf67de5ea906 (patch) | |
| tree | 5ae495bc5d4d3eafa54c2ca5f7c5e5482516e4ec /fs/btrfs/transaction.h | |
| parent | b38ef71cb102208dffcf4e8524e9d5ec4ec0eaa9 (diff) | |
| parent | a6f69dc8018dbb4ce2009ccba49b53f68c8bdc64 (diff) | |
Merge branch 'dev/pending-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus
Diffstat (limited to 'fs/btrfs/transaction.h')
| -rw-r--r-- | fs/btrfs/transaction.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/transaction.h b/fs/btrfs/transaction.h index fd400a3668a8..00ed29c4b3f9 100644 --- a/fs/btrfs/transaction.h +++ b/fs/btrfs/transaction.h | |||
| @@ -170,4 +170,6 @@ int btrfs_wait_marked_extents(struct btrfs_root *root, | |||
| 170 | int btrfs_transaction_blocked(struct btrfs_fs_info *info); | 170 | int btrfs_transaction_blocked(struct btrfs_fs_info *info); |
| 171 | int btrfs_transaction_in_commit(struct btrfs_fs_info *info); | 171 | int btrfs_transaction_in_commit(struct btrfs_fs_info *info); |
| 172 | void btrfs_put_transaction(struct btrfs_transaction *transaction); | 172 | void btrfs_put_transaction(struct btrfs_transaction *transaction); |
| 173 | void btrfs_apply_pending_changes(struct btrfs_fs_info *fs_info); | ||
| 174 | |||
| 173 | #endif | 175 | #endif |