The commit is pushed to "branch-rh9-5.14.0-427.92.1.vz9.88.x-ovz" and will
appear at [email protected]:openvz/vzkernel.git
after rh9-5.14.0-427.92.1.vz9.88.7
------>
commit d1b15381575a194086e33623a10ed90e416c6fa5
Author: Liu Kui <[email protected]>
Date: Tue Nov 11 10:02:39 2025 +0800
fs/fuse kio: remove unused PCS_IREQ_CUSTOM handling
The PCS_IREQ_CUSTOM request type is not used in the kio module,
remove the associated dead code.
https://virtuozzo.atlassian.net/browse/VSTOR-117505
Signed-off-by: Liu Kui <[email protected]>
Acked-by: Alexey Kuznetsov <[email protected]>
Feature: vStorage
---
fs/fuse/kio/pcs/pcs_cluster.c | 32 ++++++++++++--------------------
1 file changed, 12 insertions(+), 20 deletions(-)
diff --git a/fs/fuse/kio/pcs/pcs_cluster.c b/fs/fuse/kio/pcs/pcs_cluster.c
index 6fc46f27514a2..1265680827653 100644
--- a/fs/fuse/kio/pcs/pcs_cluster.c
+++ b/fs/fuse/kio/pcs/pcs_cluster.c
@@ -48,15 +48,13 @@ void pcs_sreq_complete(struct pcs_int_request *sreq)
if (ireq_check_redo(sreq)) {
ireq_retry_inc(ireq);
sreq->flags &= ~IREQ_F_REQUEUED;
- if (sreq->type != PCS_IREQ_CUSTOM) {
- map_notify_soft_error(sreq);
-
- if (!(sreq->flags & IREQ_F_ONCE)) {
- sreq->flags |= IREQ_F_ONCE;
- pcs_clear_error(&sreq->error);
- pcs_cc_submit(sreq->cc, sreq);
- return;
- }
+ map_notify_soft_error(sreq);
+
+ if (!(sreq->flags & IREQ_F_ONCE)) {
+ sreq->flags |= IREQ_F_ONCE;
+ pcs_clear_error(&sreq->error);
+ pcs_cc_submit(sreq->cc, sreq);
+ return;
}
pcs_clear_error(&sreq->error);
ireq_delay(sreq);
@@ -65,16 +63,13 @@ void pcs_sreq_complete(struct pcs_int_request *sreq)
pcs_copy_error_cond_atomic(&ireq->error, &sreq->error);
}
- if (sreq->type != PCS_IREQ_CUSTOM)
- map_notify_iochunk_error(sreq);
+ map_notify_iochunk_error(sreq);
}
- if (sreq->type != PCS_IREQ_CUSTOM) {
- if (!(sreq->flags & IREQ_F_CACHED))
- ireq->flags &= ~IREQ_F_CACHED;
- pcs_deaccount_ireq(sreq, &sreq->error);
- } else if (sreq->custom.destruct)
- sreq->custom.destruct(sreq);
+
+ if (!(sreq->flags & IREQ_F_CACHED))
+ ireq->flags &= ~IREQ_F_CACHED;
+ pcs_deaccount_ireq(sreq, &sreq->error);
if (!pcs_sreq_detach(sreq))
ireq_complete(ireq);
@@ -489,9 +484,6 @@ static void ireq_process_(struct pcs_int_request *ireq)
case PCS_IREQ_FLUSH:
process_flush_req(ireq);
break;
- case PCS_IREQ_CUSTOM:
- ireq->custom.action(ireq);
- break;
case PCS_IREQ_TOKEN:
process_ireq_token(ireq);
break;
_______________________________________________
Devel mailing list
[email protected]
https://lists.openvz.org/mailman/listinfo/devel
