diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-11 11:23:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-11 11:23:13 -0700 |
| commit | 474a503d4bf77ae0cbe484dd0842a2648c0b1c28 (patch) | |
| tree | 70e3e4023209e741546491a58622bd45fb13e308 /fs/btrfs/file.c | |
| parent | d43c36dc6b357fa1806800f18aa30123c747a6d1 (diff) | |
| parent | ac6889cbb254be1ffea376bea4a96ce9be0e0ed0 (diff) | |
| download | kernel_samsung_smdk4412-474a503d4bf77ae0cbe484dd0842a2648c0b1c28.tar.gz kernel_samsung_smdk4412-474a503d4bf77ae0cbe484dd0842a2648c0b1c28.tar.bz2 kernel_samsung_smdk4412-474a503d4bf77ae0cbe484dd0842a2648c0b1c28.zip | |
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 file clone ioctl for bookend extents
Btrfs: fix uninit compiler warning in cow_file_range_nocow
Btrfs: constify dentry_operations
Btrfs: optimize back reference update during btrfs_drop_snapshot
Btrfs: remove negative dentry when deleting subvolumne
Btrfs: optimize fsync for the single writer case
Btrfs: async delalloc flushing under space pressure
Btrfs: release delalloc reservations on extent item insertion
Btrfs: delay clearing EXTENT_DELALLOC for compressed extents
Btrfs: cleanup extent_clear_unlock_delalloc flags
Btrfs: fix possible softlockup in the allocator
Btrfs: fix deadlock on async thread startup
Diffstat (limited to 'fs/btrfs/file.c')
| -rw-r--r-- | fs/btrfs/file.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index f19e1259a97..2d623aa0625 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -878,7 +878,8 @@ again: btrfs_put_ordered_extent(ordered); clear_extent_bits(&BTRFS_I(inode)->io_tree, start_pos, - last_pos - 1, EXTENT_DIRTY | EXTENT_DELALLOC, + last_pos - 1, EXTENT_DIRTY | EXTENT_DELALLOC | + EXTENT_DO_ACCOUNTING, GFP_NOFS); unlock_extent(&BTRFS_I(inode)->io_tree, start_pos, last_pos - 1, GFP_NOFS); |