summaryrefslogtreecommitdiffstats
path: root/fs/ext4
diff options
context:
space:
mode:
authorMike Christie <mchristi@redhat.com>2016-06-08 22:49:40 +0200
committerJens Axboe <axboe@fb.com>2016-06-08 23:01:08 +0200
commit60a40096a3b289c28429221c12a5a6890350d919 (patch)
treea7c75a46cd1cc05c3754f532849f575876e89a9d /fs/ext4
parentcfq-iosched: Convert to use highres timers (diff)
downloadlinux-60a40096a3b289c28429221c12a5a6890350d919.tar.xz
linux-60a40096a3b289c28429221c12a5a6890350d919.zip
ext4: use bio op helprs in ext4 crypto code
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 commit 95fe6c1a209ef89d9f94dd04a0ad72be1487d5d5 Author: Mike Christie <mchristi@redhat.com> Date: Sun Jun 5 14:31:48 2016 -0500 block, fs, mm, drivers: use bio set/get op accessors Signed-off-by: Mike Christie <mchristi@redhat.com> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'fs/ext4')
-rw-r--r--fs/ext4/crypto.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/crypto.c b/fs/ext4/crypto.c
index 811bd5de8099..d3fa47c2b8a3 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) {