TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

grow_dev_folio(): we only want ->bd_inode->i_mapping there

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Link: https://lore.kernel.org/r/20240411145346.2516848-3-viro@zeniv.linux.org.uk
Reviewed-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>
This commit is contained in:
Al Viro
2024-04-11 15:53:38 +01:00
parent 224941e837
commit 22f89a4f8c
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/buffer.c
+4 -4
View File
@@ -1034,12 +1034,12 @@ static sector_t folio_init_buffers(struct folio *folio,
static bool grow_dev_folio(struct block_device *bdev, sector_t block, static bool grow_dev_folio(struct block_device *bdev, sector_t block,
pgoff_t index, unsigned size, gfp_t gfp) pgoff_t index, unsigned size, gfp_t gfp)
{ {
struct inode *inode = bdev->bd_inode; struct address_space *mapping = bdev->bd_mapping;
struct folio *folio; struct folio *folio;
struct buffer_head *bh; struct buffer_head *bh;
sector_t end_block = 0; sector_t end_block = 0;
folio = __filemap_get_folio(inode->i_mapping, index, folio = __filemap_get_folio(mapping, index,
FGP_LOCK | FGP_ACCESSED | FGP_CREAT, gfp); FGP_LOCK | FGP_ACCESSED | FGP_CREAT, gfp);
if (IS_ERR(folio)) if (IS_ERR(folio))
return false; return false;
@@ -1073,10 +1073,10 @@ static bool grow_dev_folio(struct block_device *bdev, sector_t block,
* lock to be atomic wrt __find_get_block(), which does not * lock to be atomic wrt __find_get_block(), which does not
* run under the folio lock. * run under the folio lock.
*/ */
spin_lock(&inode->i_mapping->i_private_lock); spin_lock(&mapping->i_private_lock);
link_dev_buffers(folio, bh); link_dev_buffers(folio, bh);
end_block = folio_init_buffers(folio, bdev, size); end_block = folio_init_buffers(folio, bdev, size);
spin_unlock(&inode->i_mapping->i_private_lock); spin_unlock(&mapping->i_private_lock);
unlock: unlock:
folio_unlock(folio); folio_unlock(folio);
folio_put(folio); folio_put(folio);