aboutsummaryrefslogtreecommitdiffstats
path: root/fs/udf
diff options
context:
space:
mode:
authorMike Christie <mchristi@redhat.com>2016-06-05 15:31:44 -0400
committerJens Axboe <axboe@fb.com>2016-06-07 15:41:38 -0400
commitdfec8a14fc9043039e3c04807caf39dc71102816 (patch)
tree306adbd461707daf2ba64766964c534ff7ce4a8c /fs/udf
parent2a222ca992c35aee1e83af428f3dd26a3f5d5d94 (diff)
fs: have ll_rw_block users pass in op and flags separately
This has ll_rw_block users pass in the operation and flags separately, so ll_rw_block can setup the bio op and bi_rw flags on the bio that is submitted. Signed-off-by: Mike Christie <mchristi@redhat.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Hannes Reinecke <hare@suse.com> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'fs/udf')
-rw-r--r--fs/udf/dir.c2
-rw-r--r--fs/udf/directory.c2
-rw-r--r--fs/udf/inode.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/fs/udf/dir.c b/fs/udf/dir.c
index 4c5593abc553..80c8a21daed9 100644
--- a/fs/udf/dir.c
+++ b/fs/udf/dir.c
@@ -113,7 +113,7 @@ static int udf_readdir(struct file *file, struct dir_context *ctx)
113 brelse(tmp); 113 brelse(tmp);
114 } 114 }
115 if (num) { 115 if (num) {
116 ll_rw_block(READA, num, bha); 116 ll_rw_block(REQ_OP_READ, READA, num, bha);
117 for (i = 0; i < num; i++) 117 for (i = 0; i < num; i++)
118 brelse(bha[i]); 118 brelse(bha[i]);
119 } 119 }
diff --git a/fs/udf/directory.c b/fs/udf/directory.c
index c763fda257bf..71f3e0b5b8ab 100644
--- a/fs/udf/directory.c
+++ b/fs/udf/directory.c
@@ -87,7 +87,7 @@ struct fileIdentDesc *udf_fileident_read(struct inode *dir, loff_t *nf_pos,
87 brelse(tmp); 87 brelse(tmp);
88 } 88 }
89 if (num) { 89 if (num) {
90 ll_rw_block(READA, num, bha); 90 ll_rw_block(REQ_OP_READ, READA, num, bha);
91 for (i = 0; i < num; i++) 91 for (i = 0; i < num; i++)
92 brelse(bha[i]); 92 brelse(bha[i]);
93 } 93 }
diff --git a/fs/udf/inode.c b/fs/udf/inode.c
index f323aff740ef..55aa587bbc38 100644
--- a/fs/udf/inode.c
+++ b/fs/udf/inode.c
@@ -1199,7 +1199,7 @@ struct buffer_head *udf_bread(struct inode *inode, int block,
1199 if (buffer_uptodate(bh)) 1199 if (buffer_uptodate(bh))
1200 return bh; 1200 return bh;
1201 1201
1202 ll_rw_block(READ, 1, &bh); 1202 ll_rw_block(REQ_OP_READ, 0, 1, &bh);
1203 1203
1204 wait_on_buffer(bh); 1204 wait_on_buffer(bh);
1205 if (buffer_uptodate(bh)) 1205 if (buffer_uptodate(bh))