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

Commit 57d6bce7 authored by Jaegeuk Kim's avatar Jaegeuk Kim Committed by Jaegeuk Kim
Browse files

f2fs, block_dump: give WRITE direction to submit_bio 



The block_dump in submit_bio uses rw, instead of bio->bi_rw.

Change-Id: Iacbec6caabff64d188eb1df84f006b41916e1098
Fixes: a3ccc667 ("fscrypt,f2fs: catch up fscrypt and f2fs-stable/v3.18 having v4.12-rc1"
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 8c2b1e3b

fs/f2fs/data.c

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ submit_io: 
		trace_f2fs_submit_read_bio(sbi->sb, type, bio);

	else

		trace_f2fs_submit_write_bio(sbi->sb, type, bio);

	submit_bio(0, bio);

	submit_bio(bio_op(bio), bio);

}



static void __submit_merged_bio(struct f2fs_bio_info *io)

fs/f2fs/segment.c

+1 −1
Original line number Diff line number Diff line
@@ -821,7 +821,7 @@ static int __blkdev_issue_discard(struct block_device *bdev, sector_t sector, 
		}



		if (bio) {

			int ret = submit_bio_wait(0, bio);

			int ret = submit_bio_wait(op, bio);

			bio_put(bio);

			if (ret)

				return ret;