btrfs: use detach_page_private() in alloc_extent_buffer()
authorQu Wenruo <wqu@suse.com>
Fri, 13 Nov 2020 12:51:49 +0000 (20:51 +0800)
committerDavid Sterba <dsterba@suse.com>
Tue, 8 Dec 2020 14:54:14 +0000 (15:54 +0100)
In alloc_extent_buffer(), after we got a page from btree inode, we check
if that page has private pointer attached.

If attached, we check if the existing extent buffer has proper refs.
If not (the eb is being freed), we will detach that private eb pointer.

The point here is, we are detaching that eb pointer by calling:
- ClearPagePrivate()
- put_page()

The put_page() here is especially confusing, as it's decreasing the ref
from attach_page_private().  Without knowing that, it looks like the
put_page() is for the find_or_create_page() call, confusing the reader.

Since we're always modifying page private with attach_page_private() and
detach_page_private(), the only open-coded detach_page_private() here is
really confusing.

Fix it by calling detach_page_private().

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/extent_io.c

index cdccfdb..f514304 100644 (file)
@@ -5278,13 +5278,8 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info,
                        }
                        exists = NULL;
 
-                       /*
-                        * Do this so attach doesn't complain and we need to
-                        * drop the ref the old guy had.
-                        */
-                       ClearPagePrivate(p);
                        WARN_ON(PageDirty(p));
-                       put_page(p);
+                       detach_page_private(p);
                }
                attach_extent_buffer_page(eb, p);
                spin_unlock(&mapping->private_lock);