diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-10-07 10:43:04 -0400 |
| commit | a56e74f546b64be93731e42d83baf5b538cc1b11 (patch) | |
| tree | 18f6dee45d801e57ac9db2a31664b0d5c0762c50 /fs/btrfs/transaction.c | |
| parent | d08e2e09042bd3f7ef66a35cb4bb92794ab26bb2 (diff) | |
| parent | e4e7f10bfc4069925e99cc4b428c3434e30b6c3f (diff) | |
Merge branch 'arm-aesbs' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into devel-stable
Diffstat (limited to 'fs/btrfs/transaction.c')
| -rw-r--r-- | fs/btrfs/transaction.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index cac4a3f76323..e7a95356df83 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c | |||
| @@ -1603,7 +1603,7 @@ static inline int btrfs_start_delalloc_flush(struct btrfs_fs_info *fs_info) | |||
| 1603 | static inline void btrfs_wait_delalloc_flush(struct btrfs_fs_info *fs_info) | 1603 | static inline void btrfs_wait_delalloc_flush(struct btrfs_fs_info *fs_info) |
| 1604 | { | 1604 | { |
| 1605 | if (btrfs_test_opt(fs_info->tree_root, FLUSHONCOMMIT)) | 1605 | if (btrfs_test_opt(fs_info->tree_root, FLUSHONCOMMIT)) |
| 1606 | btrfs_wait_all_ordered_extents(fs_info, 1); | 1606 | btrfs_wait_all_ordered_extents(fs_info); |
| 1607 | } | 1607 | } |
| 1608 | 1608 | ||
| 1609 | int btrfs_commit_transaction(struct btrfs_trans_handle *trans, | 1609 | int btrfs_commit_transaction(struct btrfs_trans_handle *trans, |