1 files changed, 73 insertions, 60 deletions

diff --git a/xlators/protocol/server/src/server-helpers.h b/xlators/protocol/server/src/server-helpers.h
index 5ce5e36acfe..837fdc84f17 100644
--- a/xlators/protocol/server/src/server-helpers.h
+++ b/xlators/protocol/server/src/server-helpers.h
@@ -1,94 +1,107 @@
 /*
-  Copyright (c) 2010-2011 Gluster, Inc. <http://www.gluster.com>
+  Copyright (c) 2010-2013 Red Hat, Inc. <http://www.redhat.com>
   This file is part of GlusterFS.
 
-  GlusterFS is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published
-  by the Free Software Foundation; either version 3 of the License,
-  or (at your option) any later version.
-
-  GlusterFS is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program.  If not, see
-  <http://www.gnu.org/licenses/>.
+  This file is licensed to you under your choice of the GNU Lesser
+  General Public License, version 3 or any later version (LGPLv3 or
+  later), or the GNU General Public License, version 2 (GPLv2), in all
+  cases as published by the Free Software Foundation.
 */
 
 #ifndef _SERVER_HELPERS_H
 #define _SERVER_HELPERS_H
 
 #include "server.h"
+#include <glusterfs/defaults.h>
 
-#define CALL_STATE(frame)   ((server_state_t *)frame->root->state)
-
-#define BOUND_XL(frame)     ((xlator_t *) CALL_STATE(frame)->conn->bound_xl)
+#define CALL_STATE(frame) ((server_state_t *)frame->root->state)
 
-#define XPRT_FROM_FRAME(frame) ((rpc_transport_t *) CALL_STATE(frame)->xprt)
+#define XPRT_FROM_FRAME(frame) ((rpc_transport_t *)CALL_STATE(frame)->xprt)
 
-#define SERVER_CONNECTION(frame)                                \
-        ((server_connection_t *) CALL_STATE(frame)->conn)
-
-#define SERVER_CONF(frame)                                              \
-        ((server_conf_t *)XPRT_FROM_FRAME(frame)->this->private)
+#define SERVER_CONF(frame)                                                     \
+    ((server_conf_t *)XPRT_FROM_FRAME(frame)->this->private)
 
 #define XPRT_FROM_XLATOR(this) ((((server_conf_t *)this->private))->listen)
 
-#define INODE_LRU_LIMIT(this)                                           \
-        (((server_conf_t *)(this->private))->config.inode_lru_limit)
+#define INODE_LRU_LIMIT(this)                                                  \
+    (((server_conf_t *)(this->private))->config.inode_lru_limit)
 
 #define IS_ROOT_INODE(inode) (inode == inode->table->root)
 
-#define IS_NOT_ROOT(pathlen) ((pathlen > 2)? 1 : 0)
-
-void free_state (server_state_t *state);
+#define IS_NOT_ROOT(pathlen) ((pathlen > 2) ? 1 : 0)
 
-void server_loc_wipe (loc_t *loc);
-
-int32_t
-gf_add_locker (server_connection_t *conn, const char *volume,
-               loc_t *loc,
-               fd_t *fd,
-               pid_t pid,
-               gf_lkowner_t *owner,
-               glusterfs_fop_t type);
+void
+free_state(server_state_t *state);
 
-int32_t
-gf_del_locker (server_connection_t *conn, const char *volume,
-               loc_t *loc,
-               fd_t *fd,
-               gf_lkowner_t *owner,
-               glusterfs_fop_t type);
+void
+server_loc_wipe(loc_t *loc);
 
 void
-server_print_request (call_frame_t *frame);
+server_print_request(call_frame_t *frame);
 
 call_frame_t *
-get_frame_from_request (rpcsvc_request_t *req);
+get_frame_from_request(rpcsvc_request_t *req);
 
-gf_boolean_t
-server_cancel_conn_timer (xlator_t *this, server_connection_t *conn);
+int
+server_connection_cleanup(xlator_t *this, struct _client *client, int32_t flags,
+                          gf_boolean_t *fd_exist);
 
-void
-put_server_conn_state (xlator_t *this, rpc_transport_t *xprt);
+int
+server_build_config(xlator_t *this, server_conf_t *conf);
 
-server_connection_t *
-get_server_conn_state (xlator_t *this, rpc_transport_t *xptr);
+int
+serialize_rsp_dirent(gf_dirent_t *entries, gfs3_readdir_rsp *rsp);
+int
+serialize_rsp_direntp(gf_dirent_t *entries, gfs3_readdirp_rsp *rsp);
+int
+readdirp_rsp_cleanup(gfs3_readdirp_rsp *rsp);
+int
+readdir_rsp_cleanup(gfs3_readdir_rsp *rsp);
+int
+readdirp_rsp_cleanup_v2(gfx_readdirp_rsp *rsp);
+int
+readdir_rsp_cleanup_v2(gfx_readdir_rsp *rsp);
+int
+auth_set_username_passwd(dict_t *input_params, dict_t *config_params,
+                         struct _client *client);
 
-server_connection_t *
-create_server_conn_state (xlator_t *this, rpc_transport_t *xptr);
+server_ctx_t *
+server_ctx_get(client_t *client, xlator_t *xlator);
+int
+server_process_event_upcall(xlator_t *this, void *data);
 
-void
-destroy_server_conn_state (server_connection_t *conn);
+inode_t *
+server_inode_new(inode_table_t *itable, uuid_t gfid);
 
 int
-server_build_config (xlator_t *this, server_conf_t *conf);
+serialize_rsp_locklist(lock_migration_info_t *locklist,
+                       gfs3_getactivelk_rsp *rsp);
+int
+serialize_rsp_locklist_v2(lock_migration_info_t *locklist,
+                          gfx_getactivelk_rsp *rsp);
 
-int serialize_rsp_dirent (gf_dirent_t *entries, gfs3_readdir_rsp *rsp);
-int serialize_rsp_direntp (gf_dirent_t *entries, gfs3_readdirp_rsp *rsp);
-int readdirp_rsp_cleanup (gfs3_readdirp_rsp *rsp);
-int readdir_rsp_cleanup (gfs3_readdir_rsp *rsp);
+int
+getactivelkinfo_rsp_cleanup(gfs3_getactivelk_rsp *rsp);
+int
+getactivelkinfo_rsp_cleanup_v2(gfx_getactivelk_rsp *rsp);
+
+int
+unserialize_req_locklist(gfs3_setactivelk_req *req, lock_migration_info_t *lmi);
+
+int
+unserialize_req_locklist_v2(gfx_setactivelk_req *req,
+                            lock_migration_info_t *lmi);
+
+int
+serialize_rsp_dirent(gf_dirent_t *entries, gfs3_readdir_rsp *rsp);
+
+int
+serialize_rsp_direntp(gf_dirent_t *entries, gfs3_readdirp_rsp *rsp);
+
+int
+serialize_rsp_dirent_v2(gf_dirent_t *entries, gfx_readdir_rsp *rsp);
+
+int
+serialize_rsp_direntp_v2(gf_dirent_t *entries, gfx_readdirp_rsp *rsp);
 
 #endif /* !_SERVER_HELPERS_H */