tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UPSTREAM: f2fs: Use a data folio in f2fs_submit_page_bio()

Browse Source 
Remove a call to compound_head().  We can call bio_add_folio_nofail()
here because we just allocated the bio, so we know it can't fail and
thus the error path can never be taken.

Change-Id: I4ab58f44624f79d5f8f8c32383c7b4bad9ff26c4
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
(cherry picked from commit f58d8645824b4885caa9e24989f8e601b5e7ed50)
This commit is contained in:
Matthew Wilcox (Oracle)
2024-11-28 04:58:24 +00:00
committed by Jaegeuk Kim
parent 7958eadfce
commit f0f8e36ade
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/f2fs/data.c
+5 -9
View File
@@ -690,32 +690,28 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio)
{
struct bio *bio;
struct folio *fio_folio = page_folio(fio->page);
struct page *page = fio->encrypted_page ?
fio->encrypted_page : fio->page;
struct folio *data_folio = fio->encrypted_page ?
page_folio(fio->encrypted_page) : fio_folio;
if (!f2fs_is_valid_blkaddr(fio->sbi, fio->new_blkaddr,
fio->is_por ? META_POR : (__is_meta_io(fio) ?
META_GENERIC : DATA_GENERIC_ENHANCE)))
return -EFSCORRUPTED;
trace_f2fs_submit_folio_bio(page_folio(page), fio);
trace_f2fs_submit_folio_bio(data_folio, fio);
/* Allocate a new bio */
bio = __bio_alloc(fio, 1);
f2fs_set_bio_crypt_ctx(bio, fio_folio->mapping->host,
fio_folio->index, fio, GFP_NOIO);
if (bio_add_page(bio, page, PAGE_SIZE, 0) < PAGE_SIZE) {
bio_put(bio);
return -EFAULT;
}
bio_add_folio_nofail(bio, data_folio, folio_size(data_folio), 0);
if (fio->io_wbc && !is_read_io(fio->op))
wbc_account_cgroup_owner(fio->io_wbc, fio_folio, PAGE_SIZE);
inc_page_count(fio->sbi, is_read_io(fio->op) ?
__read_io_type(page) : WB_DATA_TYPE(fio->page, false));
__read_io_type(&data_folio->page) : WB_DATA_TYPE(fio->page, false));
if (is_read_io(bio_op(bio)))
f2fs_submit_read_bio(fio->sbi, bio, fio->type);