diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2018-03-14 20:23:25 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-03-14 20:23:25 +0100 |
| commit | 745dd37f9d67c75d6cf1a1bebfcca71bdeb7a34c (patch) | |
| tree | e556543ed86b7f49e4972d8ea048ff9e46592b4d /fs/btrfs/relocation.c | |
| parent | 02428742639bc3300c8c527b054d0ec0bdf5571d (diff) | |
| parent | 18a955219bf7d9008ce480d4451b6b8bf4483a22 (diff) | |
Merge branch 'x86/urgent' into x86/mm to pick up dependencies
Diffstat (limited to 'fs/btrfs/relocation.c')
| -rw-r--r-- | fs/btrfs/relocation.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index f0c3f00e97cb..cd2298d185dd 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -3268,8 +3268,22 @@ static int relocate_file_extent_cluster(struct inode *inode, nr++; } - btrfs_set_extent_delalloc(inode, page_start, page_end, 0, NULL, - 0); + ret = btrfs_set_extent_delalloc(inode, page_start, page_end, 0, + NULL, 0); + if (ret) { + unlock_page(page); + put_page(page); + btrfs_delalloc_release_metadata(BTRFS_I(inode), + PAGE_SIZE); + btrfs_delalloc_release_extents(BTRFS_I(inode), + PAGE_SIZE); + + clear_extent_bits(&BTRFS_I(inode)->io_tree, + page_start, page_end, + EXTENT_LOCKED | EXTENT_BOUNDARY); + goto out; + + } set_page_dirty(page); unlock_extent(&BTRFS_I(inode)->io_tree, |