PM: 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 first two
hib_submit_io() arguments into a single argument.

Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20220714180729.1065367-62-bvanassche@acm.org
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/kernel/power/swap.c b/kernel/power/swap.c
index 91fffdd2c7fb9b4a9ecec1c742248f4684e79182..277434b6c0bfd24f4ff0d9c9c537322419f5d3b2 100644 (file)
--- a/kernel/power/swap.c
+++ b/kernel/power/swap.c
@@ -269,15 +269,14 @@ static void hib_end_io(struct bio *bio)
        bio_put(bio);
 }
 
-static int hib_submit_io(int op, int op_flags, pgoff_t page_off, void *addr,
-               struct hib_bio_batch *hb)
+static int hib_submit_io(blk_opf_t opf, pgoff_t page_off, void *addr,
+                        struct hib_bio_batch *hb)
 {
        struct page *page = virt_to_page(addr);
        struct bio *bio;
        int error = 0;
 
-       bio = bio_alloc(hib_resume_bdev, 1, op | op_flags,
-                       GFP_NOIO | __GFP_HIGH);
+       bio = bio_alloc(hib_resume_bdev, 1, opf, GFP_NOIO | __GFP_HIGH);
        bio->bi_iter.bi_sector = page_off * (PAGE_SIZE >> 9);
 
        if (bio_add_page(bio, page, PAGE_SIZE, 0) < PAGE_SIZE) {
@@ -317,8 +316,7 @@ static int mark_swapfiles(struct swap_map_handle *handle, unsigned int flags)
 {
        int error;
 
-       hib_submit_io(REQ_OP_READ, 0, swsusp_resume_block,
-                     swsusp_header, NULL);
+       hib_submit_io(REQ_OP_READ, swsusp_resume_block, swsusp_header, NULL);
        if (!memcmp("SWAP-SPACE",swsusp_header->sig, 10) ||
            !memcmp("SWAPSPACE2",swsusp_header->sig, 10)) {
                memcpy(swsusp_header->orig_sig,swsusp_header->sig, 10);
@@ -331,7 +329,7 @@ static int mark_swapfiles(struct swap_map_handle *handle, unsigned int flags)
                swsusp_header->flags = flags;
                if (flags & SF_CRC32_MODE)
                        swsusp_header->crc32 = handle->crc32;
-               error = hib_submit_io(REQ_OP_WRITE, REQ_SYNC,
+               error = hib_submit_io(REQ_OP_WRITE | REQ_SYNC,
                                      swsusp_resume_block, swsusp_header, NULL);
        } else {
                pr_err("Swap header not found!\n");
@@ -408,7 +406,7 @@ static int write_page(void *buf, sector_t offset, struct hib_bio_batch *hb)
        } else {
                src = buf;
        }
-       return hib_submit_io(REQ_OP_WRITE, REQ_SYNC, offset, src, hb);
+       return hib_submit_io(REQ_OP_WRITE | REQ_SYNC, offset, src, hb);
 }
 
 static void release_swap_writer(struct swap_map_handle *handle)
@@ -1003,7 +1001,7 @@ static int get_swap_reader(struct swap_map_handle *handle,
                        return -ENOMEM;
                }
 
-               error = hib_submit_io(REQ_OP_READ, 0, offset, tmp->map, NULL);
+               error = hib_submit_io(REQ_OP_READ, offset, tmp->map, NULL);
                if (error) {
                        release_swap_reader(handle);
                        return error;
@@ -1027,7 +1025,7 @@ static int swap_read_page(struct swap_map_handle *handle, void *buf,
        offset = handle->cur->entries[handle->k];
        if (!offset)
                return -EFAULT;
-       error = hib_submit_io(REQ_OP_READ, 0, offset, buf, hb);
+       error = hib_submit_io(REQ_OP_READ, offset, buf, hb);
        if (error)
                return error;
        if (++handle->k >= MAP_PAGE_ENTRIES) {
@@ -1526,8 +1524,7 @@ int swsusp_check(void)
        if (!IS_ERR(hib_resume_bdev)) {
                set_blocksize(hib_resume_bdev, PAGE_SIZE);
                clear_page(swsusp_header);
-               error = hib_submit_io(REQ_OP_READ, 0,
-                                       swsusp_resume_block,
+               error = hib_submit_io(REQ_OP_READ, swsusp_resume_block,
                                        swsusp_header, NULL);
                if (error)
                        goto put;
@@ -1535,7 +1532,7 @@ int swsusp_check(void)
                if (!memcmp(HIBERNATE_SIG, swsusp_header->sig, 10)) {
                        memcpy(swsusp_header->sig, swsusp_header->orig_sig, 10);
                        /* Reset swap signature now */
-                       error = hib_submit_io(REQ_OP_WRITE, REQ_SYNC,
+                       error = hib_submit_io(REQ_OP_WRITE | REQ_SYNC,
                                                swsusp_resume_block,
                                                swsusp_header, NULL);
                } else {
@@ -1586,11 +1583,11 @@ int swsusp_unmark(void)
 {
        int error;
 
-       hib_submit_io(REQ_OP_READ, 0, swsusp_resume_block,
-                     swsusp_header, NULL);
+       hib_submit_io(REQ_OP_READ, swsusp_resume_block,
+                       swsusp_header, NULL);
        if (!memcmp(HIBERNATE_SIG,swsusp_header->sig, 10)) {
                memcpy(swsusp_header->sig,swsusp_header->orig_sig, 10);
-               error = hib_submit_io(REQ_OP_WRITE, REQ_SYNC,
+               error = hib_submit_io(REQ_OP_WRITE | REQ_SYNC,
                                        swsusp_resume_block,
                                        swsusp_header, NULL);
        } else {