Unverified Commit 2814a7d3 authored by Davidlohr Bueso's avatar Davidlohr Bueso Committed by Christian Brauner
Browse files

fs/buffer: introduce sleeping flavors for pagecache lookups 



Add __find_get_block_nonatomic() and sb_find_get_block_nonatomic()
calls for which users will be converted where safe. These versions
will take the folio lock instead of the mapping's private_lock.

Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarDavidlohr Bueso <dave@stgolabs.net>
Link: https://kdevops.org/ext4/v6.15-rc2.html # [0]
Link: https://lore.kernel.org/all/aAAEvcrmREWa1SKF@bombadil.infradead.org/ # [1]
Link: https://lore.kernel.org/20250418015921.132400-3-dave@stgolabs.net


Tested-by: default avatar <kdevops@lists.linux.dev>
Reviewed-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent 7ffe3de5

fs/buffer.c

+9 −0
Original line number Diff line number Diff line
@@ -1414,6 +1414,15 @@ __find_get_block(struct block_device *bdev, sector_t block, unsigned size) 
}

EXPORT_SYMBOL(__find_get_block);



/* same as __find_get_block() but allows sleeping contexts */

struct buffer_head *

__find_get_block_nonatomic(struct block_device *bdev, sector_t block,

			   unsigned size)

{

	return find_get_block_common(bdev, block, size, false);

}

EXPORT_SYMBOL(__find_get_block_nonatomic);



/**

 * bdev_getblk - Get a buffer_head in a block device's buffer cache.

 * @bdev: The block device.

include/linux/buffer_head.h

+8 −0
Original line number Diff line number Diff line
@@ -222,6 +222,8 @@ void __wait_on_buffer(struct buffer_head *); 
wait_queue_head_t *bh_waitq_head(struct buffer_head *bh);

struct buffer_head *__find_get_block(struct block_device *bdev, sector_t block,

			unsigned size);

struct buffer_head *__find_get_block_nonatomic(struct block_device *bdev,

			sector_t block, unsigned size);

struct buffer_head *bdev_getblk(struct block_device *bdev, sector_t block,

		unsigned size, gfp_t gfp);

void __brelse(struct buffer_head *);
@@ -397,6 +399,12 @@ sb_find_get_block(struct super_block *sb, sector_t block) 
	return __find_get_block(sb->s_bdev, block, sb->s_blocksize);

}



static inline struct buffer_head *

sb_find_get_block_nonatomic(struct super_block *sb, sector_t block)

{

	return __find_get_block_nonatomic(sb->s_bdev, block, sb->s_blocksize);

}



static inline void

map_bh(struct buffer_head *bh, struct super_block *sb, sector_t block)

{