diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-01 12:38:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-01 12:38:16 -0700 |
| commit | d3bc0e67f8525760479e88a51e87bb0c026e40f3 (patch) | |
| tree | 30ce55f25ffe60a754a51f09dc2e07a4268a59ce /fs/btrfs/inode.c | |
| parent | 4a770e638f531d078b580a5a24412c5e5f8f7ddb (diff) | |
| parent | e4e7ede739f7fb468686dfffa2d1e35dca35bacd (diff) | |
| download | op-kernel-dev-d3bc0e67f8525760479e88a51e87bb0c026e40f3.zip op-kernel-dev-d3bc0e67f8525760479e88a51e87bb0c026e40f3.tar.gz | |
Merge tag 'for-4.18-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs fixes from David Sterba:
"We have a few regression fixes for qgroup rescan status tracking and
the vm_fault_t conversion that mixed up the error values"
* tag 'for-4.18-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
Btrfs: fix mount failure when qgroup rescan is in progress
Btrfs: fix regression in btrfs_page_mkwrite() from vm_fault_t conversion
btrfs: quota: Set rescan progress to (u64)-1 if we hit last leaf
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index be98dfc..eba61bc 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -9005,13 +9005,14 @@ again: unlock_extent_cached(io_tree, page_start, page_end, &cached_state); -out_unlock: if (!ret2) { btrfs_delalloc_release_extents(BTRFS_I(inode), PAGE_SIZE, true); sb_end_pagefault(inode->i_sb); extent_changeset_free(data_reserved); return VM_FAULT_LOCKED; } + +out_unlock: unlock_page(page); out: btrfs_delalloc_release_extents(BTRFS_I(inode), PAGE_SIZE, (ret != 0)); |
