[Devel] [PATCH vz9] fs/fuse/kio: use proper versions of list_lru_[add, del]

[Konstantin Khorenko]

RedHat has backported ms commit
 0a97c01cd20b ("list_lru: allow explicit memcg and NUMA node selection")

 * Wed Jul 30 2025 CKI KWF Bot <cki-ci-bot+kwf-gitlab-com at redhat.com> [5.14.0-427.81.1.el9_4]
 - list_lru: allow explicit memcg and NUMA node selection (Rafael Aquini) [RHEL-56161]

which renames list_lru_[add,del] to list_lru_[add,del]_obj,
so use them in our code.

https://virtuozzo.atlassian.net/browse/VSTOR-117090

Signed-off-by: Konstantin Khorenko <khorenko at virtuozzo.com>

Feature: vStorage
---
 fs/fuse/kio/pcs/pcs_map.h       | 8 ++++----
 fs/fuse/kio/pcs/pcs_rdma_conn.c | 2 +-
 fs/fuse/kio/pcs/pcs_rpc.c       | 8 ++++----
 fs/fuse/kio/pcs/pcs_sock_conn.c | 2 +-
 fs/fuse/kio/pcs/pcs_sock_io.c   | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/fs/fuse/kio/pcs/pcs_map.h b/fs/fuse/kio/pcs/pcs_map.h
index c35ef0a8ddf1b..b96b8cbf83b72 100644
--- a/fs/fuse/kio/pcs/pcs_map.h
+++ b/fs/fuse/kio/pcs/pcs_map.h
@@ -278,18 +278,18 @@ static inline void map_add_lru(struct pcs_map_entry *m)
 {
 	assert_spin_locked(&m->lock);
 	if (m->flags & PCS_MAP_DIRTY)
-		list_lru_add(&m->maps->dirty_lru, &m->lru_link);
+		list_lru_add_obj(&m->maps->dirty_lru, &m->lru_link);
 	else
-		list_lru_add(&m->maps->lru, &m->lru_link);
+		list_lru_add_obj(&m->maps->lru, &m->lru_link);
 }
 
 static inline void map_del_lru(struct pcs_map_entry *m)
 {
 	assert_spin_locked(&m->lock);
 	if (m->flags & PCS_MAP_DIRTY)
-		list_lru_del(&m->maps->dirty_lru, &m->lru_link);
+		list_lru_del_obj(&m->maps->dirty_lru, &m->lru_link);
 	else
-		list_lru_del(&m->maps->lru, &m->lru_link);
+		list_lru_del_obj(&m->maps->lru, &m->lru_link);
 }
 
 static inline void pcs_map_put_locked(struct pcs_map_entry *m)
diff --git a/fs/fuse/kio/pcs/pcs_rdma_conn.c b/fs/fuse/kio/pcs/pcs_rdma_conn.c
index 846106a59d507..3e7588b9386d7 100644
--- a/fs/fuse/kio/pcs/pcs_rdma_conn.c
+++ b/fs/fuse/kio/pcs/pcs_rdma_conn.c
@@ -155,7 +155,7 @@ void pcs_rdmaconnect_start(struct pcs_rpc *ep)
 	rc.rio->netio.getmsg = rpc_get_hdr;
 	rc.rio->netio.eof = rpc_eof_cb;
 	if (ep->gc)
-		list_lru_add(&ep->gc->lru, &ep->lru_link);
+		list_lru_add_obj(&ep->gc->lru, &ep->lru_link);
 
 	if (ep->flags & PCS_RPC_F_CLNT_PEER_ID)
 		ep->flags |= PCS_RPC_F_PEER_ID;
diff --git a/fs/fuse/kio/pcs/pcs_rpc.c b/fs/fuse/kio/pcs/pcs_rpc.c
index 1c26d5e43aa08..7519f526c8776 100644
--- a/fs/fuse/kio/pcs/pcs_rpc.c
+++ b/fs/fuse/kio/pcs/pcs_rpc.c
@@ -227,7 +227,7 @@ void rpc_abort(struct pcs_rpc * ep, int fatal, int error)
 
 		ep->conn = NULL;
 		if (ep->gc)
-			list_lru_del(&ep->gc->lru, &ep->lru_link);
+			list_lru_del_obj(&ep->gc->lru, &ep->lru_link);
 
 		/* TODO: Add support of PCS_RPC_CONNECT state */
 		if (state != PCS_RPC_CONNECT) {
@@ -365,7 +365,7 @@ static void pcs_rpc_destroy(struct pcs_rpc *ep)
 	/* pcs_free(ep->sun); */
 	/* ep->sun = NULL; */
 	if (ep->gc)
-		list_lru_del(&ep->gc->lru, &ep->lru_link);
+		list_lru_del_obj(&ep->gc->lru, &ep->lru_link);
 	/*
 	 * This function is called after last reference to ep is dropped,
 	 * so we may avoid taking ep->mutex here.
@@ -474,9 +474,9 @@ void pcs_rpc_enable(struct pcs_rpc * ep, int error)
 		int idx = rpc_gc_classify(ep);
 
 		if (ep->eng->gc + idx != ep->gc) {
-			list_lru_del(&ep->gc->lru, &ep->lru_link);
+			list_lru_del_obj(&ep->gc->lru, &ep->lru_link);
 			ep->gc = ep->eng->gc + idx;
-			list_lru_add(&ep->gc->lru, &ep->lru_link);
+			list_lru_add_obj(&ep->gc->lru, &ep->lru_link);
 		}
 	}
 	TRACE("ep(%p)->state: WORK\n", ep);
diff --git a/fs/fuse/kio/pcs/pcs_sock_conn.c b/fs/fuse/kio/pcs/pcs_sock_conn.c
index 69cfe0026b984..e6044f68937e3 100644
--- a/fs/fuse/kio/pcs/pcs_sock_conn.c
+++ b/fs/fuse/kio/pcs/pcs_sock_conn.c
@@ -134,7 +134,7 @@ void pcs_sockconnect_start(struct pcs_rpc *ep)
 	sio->netio.getmsg = rpc_get_hdr;
 	sio->netio.eof = rpc_eof_cb;
 	if (ep->gc)
-		list_lru_add(&ep->gc->lru, &ep->lru_link);
+		list_lru_add_obj(&ep->gc->lru, &ep->lru_link);
 
 	if (ep->flags & PCS_RPC_F_CLNT_PEER_ID)
 		ep->flags |= PCS_RPC_F_PEER_ID;
diff --git a/fs/fuse/kio/pcs/pcs_sock_io.c b/fs/fuse/kio/pcs/pcs_sock_io.c
index 7eb231b7260d2..a9a2fe14b84c3 100644
--- a/fs/fuse/kio/pcs/pcs_sock_io.c
+++ b/fs/fuse/kio/pcs/pcs_sock_io.c
@@ -361,7 +361,7 @@ static void pcs_sockio_recv(struct pcs_sockio *sio)
 		}
 	}
 	if (count && !list_empty(&ep->lru_link) && ep->gc)
-		list_lru_add(&ep->gc->lru, &ep->lru_link);
+		list_lru_add_obj(&ep->gc->lru, &ep->lru_link);
 
 }
 
-- 
2.43.5