diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-21 17:12:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-21 17:12:58 -0400 |
| commit | ccc5ff94c66e628d3c501b26ace5d4339667715d (patch) | |
| tree | 41ca2f1552864cc86bd5735c1b05d0de2898bb05 /fs/btrfs/ordered-data.c | |
| parent | c19c6c32dcccfc89216bd579c0cb12d2dd45098f (diff) | |
| parent | 546888da82082555a56528730a83f0afd12f33bf (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: fix btrfs fallocate oops and deadlock
Btrfs: use the right node in reada_for_balance
Btrfs: fix oops on page->mapping->host during writepage
Btrfs: add a priority queue to the async thread helpers
Btrfs: use WRITE_SYNC for synchronous writes
Diffstat (limited to 'fs/btrfs/ordered-data.c')
| -rw-r--r-- | fs/btrfs/ordered-data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c index 53c87b197d70..d6f0806c682f 100644 --- a/fs/btrfs/ordered-data.c +++ b/fs/btrfs/ordered-data.c | |||
| @@ -489,7 +489,7 @@ again: | |||
| 489 | /* start IO across the range first to instantiate any delalloc | 489 | /* start IO across the range first to instantiate any delalloc |
| 490 | * extents | 490 | * extents |
| 491 | */ | 491 | */ |
| 492 | btrfs_fdatawrite_range(inode->i_mapping, start, orig_end, WB_SYNC_NONE); | 492 | btrfs_fdatawrite_range(inode->i_mapping, start, orig_end, WB_SYNC_ALL); |
| 493 | 493 | ||
| 494 | /* The compression code will leave pages locked but return from | 494 | /* The compression code will leave pages locked but return from |
| 495 | * writepage without setting the page writeback. Starting again | 495 | * writepage without setting the page writeback. Starting again |