From fb45ced36802b98c24a8238d68bb86be7fa393e4 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 28 May 2024 12:25:26 +0900 Subject: [PATCH 1/2] missing_loop: fix potential compile-time assertion Fixes a bug introduced by 4d6437d33c45c3d31497f2e3bd8d415f775546b8. --- src/basic/missing_loop.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/basic/missing_loop.h b/src/basic/missing_loop.h index c29082f519..8a62155a5d 100644 --- a/src/basic/missing_loop.h +++ b/src/basic/missing_loop.h @@ -23,7 +23,7 @@ assert_cc(LOOP_CONFIGURE == 0x4C0A); # define LOOP_SET_DIRECT_IO 0x4C08 #else assert_cc(LO_FLAGS_DIRECT_IO == 16); -assert_cc(LO_FLAGS_DIRECT_IO == 0x4C08); +assert_cc(LOOP_SET_DIRECT_IO == 0x4C08); #endif #ifndef LOOP_SET_STATUS_SETTABLE_FLAGS From eb6d3a5917f5c92c2d4706217aa5a77a7d6dccb7 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Tue, 28 May 2024 12:26:21 +0900 Subject: [PATCH 2/2] missing_loop.h: fix LOOP_SET_STATUS_SETTABLE_FLAGS See https://github.com/torvalds/linux/blob/v6.10-rc1/include/uapi/linux/loop.h Fixes a bug in b3fe33ff52ece458a5b990a4a68d59aef7cae10b. --- src/basic/missing_loop.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/basic/missing_loop.h b/src/basic/missing_loop.h index 8a62155a5d..b88501d78b 100644 --- a/src/basic/missing_loop.h +++ b/src/basic/missing_loop.h @@ -27,5 +27,5 @@ assert_cc(LOOP_SET_DIRECT_IO == 0x4C08); #endif #ifndef LOOP_SET_STATUS_SETTABLE_FLAGS -# define LOOP_SET_STATUS_SETTABLE_FLAGS (LO_FLAGS_AUTOCLEAR | LO_FLAGS_PARTSCAN | LO_FLAGS_DIRECT_IO) +# define LOOP_SET_STATUS_SETTABLE_FLAGS (LO_FLAGS_AUTOCLEAR | LO_FLAGS_PARTSCAN) #endif