1 files changed, 10 insertions, 1 deletions

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index eb3c12e7beaf..9b37ce6e5168 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -1242,13 +1242,22 @@ again:
         delalloc_end = 0;
         found = find_delalloc_range(tree, &delalloc_start, &delalloc_end,
                                     max_bytes);
-        if (!found) {
+        if (!found || delalloc_end <= *start) {
                 *start = delalloc_start;
                 *end = delalloc_end;
                 return found;
         }
 
         /*
+         * start comes from the offset of locked_page.  We have to lock
+         * pages in order, so we can't process delalloc bytes before
+         * locked_page
+         */
+        if (delalloc_start < *start) {
+                delalloc_start = *start;
+        }
+
+        /*
          * make sure to limit the number of pages we try to lock down
          * if we're looping.
          */