btrfs: push the extent lock into btrfs_run_delalloc_range

We want to limit the scope of the extent lock to be around operations
that can change in flight.  Currently we hold the extent lock through
the entire writepage operation, which isn't really necessary.

We want to protect to make sure nobody has updated DELALLOC.  In
find_lock_delalloc_range we must lock the range in order to validate the
contents of our io_tree.  However once we've done that we're safe to
unlock the range and continue, as we have the page lock already held for
the range.

We are protected from all operations at this point.

* mmap() - we're holding the page lock, thus are protected.
* buffered writes - again, we're protected because we take the page lock
  for the first and last page in our range for buffered writes so we
  won't create new delalloc ranges in this area.
* direct IO - we invalidate pagecache before attempting to write a new
  area, which requires the page lock, so again are protected once we're
  holding the page lock on this range.

Additionally this behavior actually already exists for compressed, we
unlock the range as soon as we start to process the async extents, and
re-lock it during compression.  So this is completely safe, and makes
the locking more consistent.

Make this simple by just pushing the extent lock into
btrfs_run_delalloc_range.  From there followup patches will push the
lock further down into its users.

Reviewed-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index a9f9f5abdf530cc55c9da54f27f1a30c94ebe0ff..d76ba4099b790a94b10662754f134488ab8064d5 100644 (file)
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -396,15 +396,14 @@ again:
        /* then test to make sure it is all still delalloc */
        ret = test_range_bit(tree, delalloc_start, delalloc_end,
                             EXTENT_DELALLOC, cached_state);
+
+       unlock_extent(tree, delalloc_start, delalloc_end, &cached_state);
        if (!ret) {
-               unlock_extent(tree, delalloc_start, delalloc_end,
-                             &cached_state);
                __unlock_for_delalloc(inode, locked_page,
                              delalloc_start, delalloc_end);
                cond_resched();
                goto again;
        }
-       free_extent_state(cached_state);
        *start = delalloc_start;
        *end = delalloc_end;
 out_failed:

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index d82c453ae9d7cbd08c71ec5214c3fc56989017ca..347de4e3a33144a532c42e8eb5b165e41794ba84 100644 (file)
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2249,6 +2249,11 @@ int btrfs_run_delalloc_range(struct btrfs_inode *inode, struct page *locked_page
        const bool zoned = btrfs_is_zoned(inode->root->fs_info);
        int ret;
 
+       /*
+        * We're unlocked by the different fill functions below.
+        */
+       lock_extent(&inode->io_tree, start, end, NULL);
+
        /*
         * The range must cover part of the @locked_page, or a return of 1
         * can confuse the caller.