Message ID | 1465418981-7360-2-git-send-email-mchristi@redhat.com |
---|---|
State | New, archived |
Headers | show |
On 06/08/2016 02:49 PM, mchristi@redhat.com wrote: > From: Mike Christie <mchristi@redhat.com> > > This was missed from my last patchset. > > This patch has ext4 crypto code use the bio op helper > to set the operation. The operation (discard, write, writesame, > etc) is now defined seperately from the other REQ bits. They > still share the bi_rw field to save space, so we use these > helpers so modules do not have to worry about setting/overwriting > info. > > Jens, I am not sure how you handle patches on top of patches > in the next branches. If you merge patches that fix issues > in previous patches in next, then this patch could be part > of Since it's all merged, there's only one way to handle it - and that's to apply this on top. I can't fold patches at this point.
diff --git a/fs/ext4/crypto.c b/fs/ext4/crypto.c index 811bd5d..d3fa47c 100644 --- a/fs/ext4/crypto.c +++ b/fs/ext4/crypto.c @@ -428,7 +428,7 @@ int ext4_encrypted_zeroout(struct inode *inode, ext4_lblk_t lblk, bio->bi_bdev = inode->i_sb->s_bdev; bio->bi_iter.bi_sector = pblk << (inode->i_sb->s_blocksize_bits - 9); - bio->bi_rw = WRITE; + bio_set_op_attrs(bio, REQ_OP_WRITE, 0); ret = bio_add_page(bio, ciphertext_page, inode->i_sb->s_blocksize, 0); if (ret != inode->i_sb->s_blocksize) {