fix get device from request

YangKeao · YangKeao · commit 6007a4f36621 · 2022-06-28T19:45:21.000+08:00
Signed-off-by: YangKeao &lt;yangkeao@chunibyo.icu&gt;
diff --git a/driver/ioem.c b/driver/ioem.c
@@ -26,7 +26,6 @@ struct request;
 #define rb_to_rq(rb) rb_entry_safe(rb, struct request, rb_node)
 #define rq_rb_first(root) rb_to_rq(rb_first(root))
 
-#define IS_RHEL 
 #define IOEM_MQ_ENABLED ((LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)) || (defined RHEL_MAJOR && RHEL_MAJOR >= 7 && defined RHEL_MINOR && RHEL_MINOR >= 6))
 
 /**
@@ -835,9 +834,15 @@ static bool ioem_should_inject(struct ioem_data* id, struct request* rq, struct
         return 0;
     }
 
+    #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)
     if (e->arg.device != 0 && e->arg.device != id->device) {
         return 0;
     }
+    #else
+    if (e->arg.device != 0 && e->arg.device != disk_devt(rq->rq_disk)) {
+        return 0;
+    }
+    #endif
 
     if (e->arg.op) 
     {

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@ struct request;`
`26`	`26`	`#define rb_to_rq(rb) rb_entry_safe(rb, struct request, rb_node)`
`27`	`27`	`#define rq_rb_first(root) rb_to_rq(rb_first(root))`
`28`	`28`
`29`		`-#define IS_RHEL`
`30`	`29`	`#define IOEM_MQ_ENABLED ((LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)) \|\| (defined RHEL_MAJOR && RHEL_MAJOR >= 7 && defined RHEL_MINOR && RHEL_MINOR >= 6))`
`31`	`30`
`32`	`31`	`/**`
`@@ -835,9 +834,15 @@ static bool ioem_should_inject(struct ioem_data* id, struct request* rq, struct`
`835`	`834`	`return 0;`
`836`	`835`	`}`
`837`	`836`
	`837`	`+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 0, 0)`
`838`	`838`	`if (e->arg.device != 0 && e->arg.device != id->device) {`
`839`	`839`	`return 0;`
`840`	`840`	`}`
	`841`	`+ #else`
	`842`	`+ if (e->arg.device != 0 && e->arg.device != disk_devt(rq->rq_disk)) {`
	`843`	`+ return 0;`
	`844`	`+ }`
	`845`	`+ #endif`
`841`	`846`
`842`	`847`	`if (e->arg.op)`
`843`	`848`	`{`