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

Commit 29baefe0 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "f2fs : Set correct bio flags to reflect REQ_RAHEAD"

parents e505a249 902ba945

fs/f2fs/data.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -624,10 +624,8 @@ static struct bio *f2fs_grab_read_bio(struct inode *inode, block_t blkaddr, 
		return ERR_PTR(-ENOMEM);

		return ERR_PTR(-ENOMEM);

	f2fs_target_device(sbi, blkaddr, bio);

	f2fs_target_device(sbi, blkaddr, bio);

	bio->bi_end_io = f2fs_read_end_io;

	bio->bi_end_io = f2fs_read_end_io;

	bio_set_op_attrs(bio, REQ_OP_READ,

	op_flag |= IS_ENCRYPTED(inode) ? REQ_NOENCRYPT : 0;

			 (IS_ENCRYPTED(inode) ?

	bio_set_op_attrs(bio, REQ_OP_READ, op_flag);

			  REQ_NOENCRYPT :

			  0));





	if (f2fs_encrypted_file(inode) &&

	if (f2fs_encrypted_file(inode) &&

		!fscrypt_using_hardware_encryption(inode))

		!fscrypt_using_hardware_encryption(inode))