loop: set LO_FLAGS_DIRECT_IO in loop_assign_backing_file

Assigning LO_FLAGS_DIRECT_IO from the O_DIRECT flag is related to
assigning a new backing file.  Move the assignment in preparation
of using the flag more and earlier.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Link: https://lore.kernel.org/r/20250131120120.1315125-3-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index bc839d6e73b7ffe09d1126ab09543088833ed68a..1ee675d28d25aaf1068f7b7f9c05c54955d8f3b3 100644 (file)
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -211,8 +211,6 @@ static inline void loop_update_dio(struct loop_device *lo)
        WARN_ON_ONCE(lo->lo_state == Lo_bound &&
                     lo->lo_queue->mq_freeze_depth == 0);
 
-       if (lo->lo_backing_file->f_flags & O_DIRECT)
-               lo->lo_flags |= LO_FLAGS_DIRECT_IO;
        if ((lo->lo_flags & LO_FLAGS_DIRECT_IO) && !lo_can_use_dio(lo))
                lo->lo_flags &= ~LO_FLAGS_DIRECT_IO;
 
@@ -579,6 +577,8 @@ static void loop_assign_backing_file(struct loop_device *lo, struct file *file)
        lo->old_gfp_mask = mapping_gfp_mask(file->f_mapping);
        mapping_set_gfp_mask(file->f_mapping,
                        lo->old_gfp_mask & ~(__GFP_IO | __GFP_FS));
+       if (lo->lo_backing_file->f_flags & O_DIRECT)
+               lo->lo_flags |= LO_FLAGS_DIRECT_IO;
 }
 
 /*