diff options
| author | Amar Tumballi <amar@gluster.com> | 2010-08-11 05:58:31 +0000 |
|---|---|---|
| committer | Anand V. Avati <avati@dev.gluster.com> | 2010-08-12 00:14:27 -0700 |
| commit | d8bb87b4c7dd40adf4fe0ba0a0946483599e0acc (patch) | |
| tree | fa12f319b8eececf9852a6f9e9e87206c016b214 /rpc/rpc-lib/src | |
| parent | fe38de53620d2c8c9dd1050a377f05a315f125d8 (diff) | |
rpc fixes
* set THIS properly so memory accounting works fine.
* also check for few pointers before dereferencing them.
Signed-off-by: Amar Tumballi <amar@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>
BUG: 1317 ()
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1317
Diffstat (limited to 'rpc/rpc-lib/src')
| -rw-r--r-- | rpc/rpc-lib/src/rpc-transport.c | 3 | ||||
| -rw-r--r-- | rpc/rpc-lib/src/rpc-transport.h | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/rpc/rpc-lib/src/rpc-transport.c b/rpc/rpc-lib/src/rpc-transport.c index 42274ed8d..c21d5ecfc 100644 --- a/rpc/rpc-lib/src/rpc-transport.c +++ b/rpc/rpc-lib/src/rpc-transport.c @@ -956,6 +956,7 @@ rpc_transport_load (glusterfs_ctx_t *ctx, dict_t *options, char *trans_name) trans->options = options; pthread_mutex_init (&trans->lock, NULL); + trans->xl = THIS; return_trans = trans; return return_trans; @@ -1054,8 +1055,6 @@ rpc_transport_destroy (rpc_transport_t *this) GF_VALIDATE_OR_GOTO("rpc_transport", this, fail); - rpc_transport_disconnect (this); - if (this->fini) this->fini (this); pthread_mutex_destroy (&this->lock); diff --git a/rpc/rpc-lib/src/rpc-transport.h b/rpc/rpc-lib/src/rpc-transport.h index f6576fc13..14ec8bc57 100644 --- a/rpc/rpc-lib/src/rpc-transport.h +++ b/rpc/rpc-lib/src/rpc-transport.h @@ -170,6 +170,7 @@ struct rpc_transport { struct rpc_transport_ops *ops; void *private; void *xl_private; + void *xl; /* Used for THIS */ void *mydata; pthread_mutex_t lock; int32_t refcount; |