dm vdo recovery-journal: fix sparse 'mixed bitwiseness' warning
authorMike Snitzer <snitzer@kernel.org>
Tue, 6 Feb 2024 02:04:21 +0000 (21:04 -0500)
committerMike Snitzer <snitzer@kernel.org>
Tue, 20 Feb 2024 18:43:18 +0000 (13:43 -0500)
Only one user of WRITE_FLAGS so no need to factor it out in an enum
(which causes sparse's 'mixed bitwiseness' warning).  Just use the
flags in the only consumer.

Signed-off-by: Mike Snitzer <snitzer@kernel.org>
Signed-off-by: Susan LeGendre-McGhee <slegendr@redhat.com>
Signed-off-by: Matthew Sakai <msakai@redhat.com>
drivers/md/dm-vdo/recovery-journal.c

index a6981e5dd017911f689b2a1b76b799831ba77748..1e15bfe42cfcf84d41a9687744c614696116ba25 100644 (file)
@@ -34,7 +34,6 @@ enum {
         */
        RECOVERY_JOURNAL_RESERVED_BLOCKS =
                (MAXIMUM_VDO_USER_VIOS / RECOVERY_JOURNAL_ENTRIES_PER_BLOCK) + 2,
-       WRITE_FLAGS = REQ_OP_WRITE | REQ_PRIO | REQ_PREFLUSH | REQ_SYNC | REQ_FUA,
 };
 
 /**
@@ -1398,7 +1397,8 @@ static void write_block(struct vdo_waiter *waiter, void *context __always_unused
         * block itself is stable before allowing overwrites of the lbn's previous data.
         */
        vdo_submit_metadata_vio(&block->vio, journal->origin + block->block_number,
-                               complete_write_endio, handle_write_error, WRITE_FLAGS);
+                               complete_write_endio, handle_write_error,
+                               REQ_OP_WRITE | REQ_PRIO | REQ_PREFLUSH | REQ_SYNC | REQ_FUA);
 }