Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf0edab1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "f2fs: don't use the submitted bio for a new page"

parents dc18fb35 ab82705c

fs/f2fs/data.c

+3 −1
Original line number Diff line number Diff line
@@ -555,8 +555,10 @@ int f2fs_merge_page_bio(struct f2fs_io_info *fio) 
	}

	/* ICE support */

	if (bio && !fscrypt_mergeable_bio(bio, dun,

				bio_encrypted, bi_crypt_skip))

				bio_encrypted, bi_crypt_skip)) {

		__submit_bio(fio->sbi, bio, fio->type);

		bio = NULL;

	}

alloc_new:

	if (!bio) {

		bio = __bio_alloc(fio->sbi, fio->new_blkaddr, fio->io_wbc,