diff options
Diffstat (limited to 'xlators/nfs')
| -rw-r--r-- | xlators/nfs/lib/src/rpcsvc.c | 5 | ||||
| -rw-r--r-- | xlators/nfs/lib/src/rpcsvc.h | 14 | ||||
| -rw-r--r-- | xlators/nfs/server/src/nfs3.c | 2 | 
3 files changed, 0 insertions, 21 deletions
diff --git a/xlators/nfs/lib/src/rpcsvc.c b/xlators/nfs/lib/src/rpcsvc.c index 1041cfda522..6a99514cb69 100644 --- a/xlators/nfs/lib/src/rpcsvc.c +++ b/xlators/nfs/lib/src/rpcsvc.c @@ -685,9 +685,6 @@ nfs_rpcsvc_conn_destroy (rpcsvc_conn_t *conn)          mem_pool_destroy (conn->txpool);          mem_pool_destroy (conn->rxpool); -        if (conn->program->conn_destroy) -                conn->program->conn_destroy (conn->program->private, conn); -          /* Need to destory record state, txlists etc. */          GF_FREE (conn);          gf_log (GF_RPCSVC, GF_LOG_DEBUG, "Connection destroyed"); @@ -989,8 +986,6 @@ nfs_rpcsvc_conn_accept_init (rpcsvc_t *svc, int listenfd,          nfs_rpcsvc_record_init (&newconn->rstate, svc->ctx->iobuf_pool);          nfs_rpcsvc_conn_state_init (newconn); -        if (destprog->conn_init) -                destprog->conn_init (destprog->private, newconn);          ret = 0;  err: diff --git a/xlators/nfs/lib/src/rpcsvc.h b/xlators/nfs/lib/src/rpcsvc.h index 79f9809e73c..7f73520d4a4 100644 --- a/xlators/nfs/lib/src/rpcsvc.h +++ b/xlators/nfs/lib/src/rpcsvc.h @@ -448,8 +448,6 @@ typedef struct rpc_svc_actor_desc {  } rpcsvc_actor_t; -typedef int (*rpcsvc_conn_notify_fn) (void *progpriv, rpcsvc_conn_t *conn); -  /* Describes a program and its version along with the function pointers   * required to handle the procedures/actors of each program/version.   * Never changed ever by any thread so no need for a lock. @@ -470,18 +468,6 @@ struct rpc_svc_program {          /* Program specific state handed to actors */          void                    *private; -        /* This upcall is made when a connection's refcount reaches 0 and the -         * connection is about to be destroyed. We want to let the RPC program -         * know that it should also now free any state it is maintaining -         * for this connection. -         */ -        rpcsvc_conn_notify_fn   conn_destroy; - -        /* Used to tell RPC program to init the state it needs to associate -         * with the new connection. -         */ -        rpcsvc_conn_notify_fn   conn_init; -          /* An integer that identifies the min auth strength that is required           * by this protocol, for eg. MOUNT3 needs AUTH_UNIX at least.           * See RFC 1813, Section 5.2.1. diff --git a/xlators/nfs/server/src/nfs3.c b/xlators/nfs/server/src/nfs3.c index d142a31f64a..7fed84d5021 100644 --- a/xlators/nfs/server/src/nfs3.c +++ b/xlators/nfs/server/src/nfs3.c @@ -4855,8 +4855,6 @@ rpcsvc_program_t        nfs3prog = {                          .proghost       = NULL,                          .actors         = nfs3svc_actors,                          .numactors      = NFS3_PROC_COUNT, -                        .conn_destroy   = NULL, -                        .conn_init      = NULL,                          /* Requests like FSINFO are sent before an auth scheme                           * is inited by client. See RFC 2623, Section 2.3.2. */  | 
