mirror of
https://github.com/torvalds/linux.git
synced 2026-10-07 22:37:45 -04:00
fs/ocfs2: Use the enum req_op and blk_opf_t types
Improve static type checking by using the enum req_op type for variables that represent a request operation and the new blk_opf_t type for variables that represent request flags. Combine the last two o2hb_setup_one_bio() arguments into a single argument. Reviewed-by: Joseph Qi <[email protected]> Cc: Mark Fasheh <[email protected]> Cc: Joel Becker <[email protected]> Signed-off-by: Bart Van Assche <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]>
This commit is contained in:
1 parent
ce6b531588
commit
61ba06c706
1 file changed
+5
-6
@@ -501,8 +501,7 @@ static void o2hb_bio_end_io(struct bio *bio)
|
||||
static struct bio *o2hb_setup_one_bio(struct o2hb_region *reg,
|
||||
struct o2hb_bio_wait_ctxt *wc,
|
||||
unsigned int *current_slot,
|
||||
unsigned int max_slots, int op,
|
||||
int op_flags)
|
||||
unsigned int max_slots, blk_opf_t opf)
|
||||
{
|
||||
int len, current_page;
|
||||
unsigned int vec_len, vec_start;
|
||||
@@ -516,7 +515,7 @@ static struct bio *o2hb_setup_one_bio(struct o2hb_region *reg,
|
||||
* GFP_KERNEL that the local node can get fenced. It would be
|
||||
* nicest if we could pre-allocate these bios and avoid this
|
||||
* all together. */
|
||||
bio = bio_alloc(reg->hr_bdev, 16, op | op_flags, GFP_ATOMIC);
|
||||
bio = bio_alloc(reg->hr_bdev, 16, opf, GFP_ATOMIC);
|
||||
if (!bio) {
|
||||
mlog(ML_ERROR, "Could not alloc slots BIO!\n");
|
||||
bio = ERR_PTR(-ENOMEM);
|
||||
@@ -564,7 +563,7 @@ static int o2hb_read_slots(struct o2hb_region *reg,
|
||||
|
||||
while(current_slot < max_slots) {
|
||||
bio = o2hb_setup_one_bio(reg, &wc, ¤t_slot, max_slots,
|
||||
REQ_OP_READ, 0);
|
||||
REQ_OP_READ);
|
||||
if (IS_ERR(bio)) {
|
||||
status = PTR_ERR(bio);
|
||||
mlog_errno(status);
|
||||
@@ -596,8 +595,8 @@ static int o2hb_issue_node_write(struct o2hb_region *reg,
|
||||
|
||||
slot = o2nm_this_node();
|
||||
|
||||
bio = o2hb_setup_one_bio(reg, write_wc, &slot, slot+1, REQ_OP_WRITE,
|
||||
REQ_SYNC);
|
||||
bio = o2hb_setup_one_bio(reg, write_wc, &slot, slot+1,
|
||||
REQ_OP_WRITE | REQ_SYNC);
|
||||
if (IS_ERR(bio)) {
|
||||
status = PTR_ERR(bio);
|
||||
mlog_errno(status);
|
||||
|
||||
Reference in new issue
Block a user