diff options
| author | Harshavardhana Ranganath <harsha@gluster.com> | 2010-01-26 09:06:18 +0000 |
|---|---|---|
| committer | Anand V. Avati <avati@dev.gluster.com> | 2010-01-26 07:23:16 -0800 |
| commit | 5a574d96c392b19a92bb925b4b4dd268393831ea (patch) | |
| tree | a3452c04ebaee4770f2fdfdc85beb6c1c043ef63 /xlators/protocol/server/src/server-protocol.h | |
| parent | ffc36da0fd9a925aa2a23026b9244787d2c0a5fd (diff) | |
Revert "Server backend storage hang should not cause the mount point to hang."
This reverts commit a0b148ea4e2a0163548eeb89b7580be4adbb8070.
Signed-off-by: Harshavardhana <harsha@gluster.com>
Signed-off-by: Anand V. Avati <avati@dev.gluster.com>
BUG: 272 (Server backend storage hang should not cause the mount point to hang)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=272
Diffstat (limited to 'xlators/protocol/server/src/server-protocol.h')
| -rw-r--r-- | xlators/protocol/server/src/server-protocol.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/xlators/protocol/server/src/server-protocol.h b/xlators/protocol/server/src/server-protocol.h index 73e7f7891..78bc13827 100644 --- a/xlators/protocol/server/src/server-protocol.h +++ b/xlators/protocol/server/src/server-protocol.h @@ -37,7 +37,6 @@ #define DEFAULT_BLOCK_SIZE 4194304 /* 4MB */ #define DEFAULT_VOLUME_FILE_PATH CONFDIR "/glusterfs.vol" -#define TRANSPORTS_PER_SERVER_CONN 2 typedef struct _server_state server_state_t; @@ -65,7 +64,6 @@ struct _server_connection { char *id; int ref; int active_transports; - transport_t *transports[TRANSPORTS_PER_SERVER_CONN]; pthread_mutex_t lock; char disconnected; fdtable_t *fdtable; @@ -77,7 +75,7 @@ typedef struct _server_connection server_connection_t; server_connection_t * -server_connection_get (xlator_t *this, const char *id, transport_t *trans); +server_connection_get (xlator_t *this, const char *id); void server_connection_put (xlator_t *this, server_connection_t *conn); @@ -86,7 +84,7 @@ int server_connection_destroy (xlator_t *this, server_connection_t *conn); int -server_connection_cleanup (xlator_t *this, server_connection_t *conn, transport_t *trans); +server_connection_cleanup (xlator_t *this, server_connection_t *conn); int server_nop_cbk (call_frame_t *frame, void *cookie, @@ -109,7 +107,6 @@ typedef struct { pthread_mutex_t mutex; struct list_head conns; gf_boolean_t verify_volfile_checksum; - char *subvol_list; gf_boolean_t trace; } server_conf_t; |