]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
btrfs: unlock all the pages with successful inline extent creation
authorJosef Bacik <josef@toxicpanda.com>
Wed, 20 Mar 2024 21:06:10 +0000 (17:06 -0400)
committerDavid Sterba <dsterba@suse.com>
Tue, 7 May 2024 19:31:09 +0000 (21:31 +0200)
Since 4750af3bbe5d ("btrfs: prevent extent_clear_unlock_delalloc() to
unlock page not locked by __process_pages_contig()") we have been
unlocking the locked page manually instead of via
extent_clear_unlock_delalloc() because of subpage blocksize support.
However we actually disable inline extent creation for subpage blocksize
support, so this behavior isn't necessary.  Remove this code and
comment, if at some point the subpage blocksize code grows support for
inline extents this can be re-evaluated.

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/inode.c

index fffa3d4015a3baa61f94faacc319acb91dc1062e..477836cae06f139779afa34698e4ade418bc96c9 100644 (file)
@@ -1358,24 +1358,11 @@ static noinline int cow_file_range(struct btrfs_inode *inode,
                         * range.
                         */
                        extent_clear_unlock_delalloc(inode, start, end,
-                                    locked_page,
+                                    NULL,
                                     EXTENT_LOCKED | EXTENT_DELALLOC |
                                     EXTENT_DELALLOC_NEW | EXTENT_DEFRAG |
                                     EXTENT_DO_ACCOUNTING, PAGE_UNLOCK |
                                     PAGE_START_WRITEBACK | PAGE_END_WRITEBACK);
-                       /*
-                        * locked_page is locked by the caller of
-                        * writepage_delalloc(), not locked by
-                        * __process_pages_contig().
-                        *
-                        * We can't let __process_pages_contig() to unlock it,
-                        * as it doesn't have any subpage::writers recorded.
-                        *
-                        * Here we manually unlock the page, since the caller
-                        * can't determine if it's an inline extent or a
-                        * compressed extent.
-                        */
-                       unlock_page(locked_page);
                        ret = 1;
                        goto done;
                } else if (ret < 0) {