diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2018-05-02 16:11:12 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-05-02 16:11:12 +0200 |
| commit | 604a98f1df2897f9ea6ca6bdab8e1c2d6844be01 (patch) | |
| tree | 99471700986d14cd5cace3e535dfcbd0e07464cb /fs/btrfs/file.c | |
| parent | 1cfd904f16740df21b2df7b41c7a0dc00cbd434c (diff) | |
| parent | 7dba33c6346c337aac3f7cd188137d4a6d3d1f3a (diff) | |
Merge branch 'timers/urgent' into timers/core
Pick up urgent fixes to apply dependent cleanup patch
Diffstat (limited to 'fs/btrfs/file.c')
| -rw-r--r-- | fs/btrfs/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 0167a9c97c9c..f660ba1e5e58 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -1748,7 +1748,7 @@ again: unlock_extent_cached(&BTRFS_I(inode)->io_tree, lockstart, lockend, &cached_state); btrfs_delalloc_release_extents(BTRFS_I(inode), reserve_bytes, - (ret != 0)); + true); if (ret) { btrfs_drop_pages(pages, num_pages); break; |