[Devel] [PATCH RHEL7 COMMIT] fuse kio: Cleanup in struct pcs_rpc

[Konstantin Khorenko]

The commit is pushed to "branch-rh7-3.10.0-693.21.1.vz7.50.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-693.21.1.vz7.50.2
------>
commit d47ba23ad19e7054bb783ef7d5deb194fefb98a0
Author: Kirill Tkhai <ktkhai at virtuozzo.com>
Date:   Mon May 28 18:38:58 2018 +0300

    fuse kio: Cleanup in struct pcs_rpc
    
    struct pcs_rpc::parent is unused, so this patch removes it.
    
    Cleanup in rpc_abort(): in the rest of code struct pcs_sockio
    is called sio. Rename in rpc_abort() for uniformity.
    
    Signed-off-by: Kirill Tkhai <ktkhai at virtuozzo.com>
    Reviewed-by: Pavel Butsykin <pbutsykin at virtuozzo.com>
---
 fs/fuse/kio/pcs/pcs_rpc.c | 6 +++---
 fs/fuse/kio/pcs/pcs_rpc.h | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/fs/fuse/kio/pcs/pcs_rpc.c b/fs/fuse/kio/pcs/pcs_rpc.c
index 966779749083..2c7bd74e5784 100644
--- a/fs/fuse/kio/pcs/pcs_rpc.c
+++ b/fs/fuse/kio/pcs/pcs_rpc.c
@@ -181,14 +181,14 @@ void rpc_abort(struct pcs_rpc * ep, int fatal, int error)
 
 	if (ep->conn) {
 		struct pcs_ioconn * ioconn = ep->conn;
-		struct pcs_sockio * conn = sio_from_ioconn(ioconn);
+		struct pcs_sockio * sio = sio_from_ioconn(ioconn);
 
 		ep->conn = NULL;
 		if (ep->gc)
 			list_lru_del(&ep->gc->lru, &ep->lru_link);
 
-		conn->parent = NULL;
-		pcs_sock_error(conn, error);
+		sio->parent = NULL;
+		pcs_sock_error(sio, error);
 	}
 
 	if (ep->state == PCS_RPC_UNCONN) {
diff --git a/fs/fuse/kio/pcs/pcs_rpc.h b/fs/fuse/kio/pcs/pcs_rpc.h
index 264657328c53..39837a74081d 100644
--- a/fs/fuse/kio/pcs/pcs_rpc.h
+++ b/fs/fuse/kio/pcs/pcs_rpc.h
@@ -63,8 +63,6 @@ struct pcs_rpc
 	struct rpc_gc_class	*gc;
 	struct pcs_rpc_engine	*eng;		/* Reference to eng, where this peer is assigned to */
 
-	void			*parent;
-
 	unsigned int		state;
 	unsigned int		flags;
 #define PCS_RPC_F_HASHED		1