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

1 files changed, 2 insertions, 1 deletions

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index be98dfc8d0f8..eba61bcb9bb3 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));