diff options
Diffstat (limited to 'xlators/protocol/server/src')
| -rw-r--r-- | xlators/protocol/server/src/server-helpers.c | 42 | ||||
| -rw-r--r-- | xlators/protocol/server/src/server-helpers.h | 2 | ||||
| -rw-r--r-- | xlators/protocol/server/src/server-rpc-fops.c | 10 |
3 files changed, 10 insertions, 44 deletions
diff --git a/xlators/protocol/server/src/server-helpers.c b/xlators/protocol/server/src/server-helpers.c index 8d6a81fe1e2..84f99ad8945 100644 --- a/xlators/protocol/server/src/server-helpers.c +++ b/xlators/protocol/server/src/server-helpers.c @@ -1221,38 +1221,6 @@ getactivelkinfo_rsp_cleanup_v2 (gfx_getactivelk_rsp *rsp) } int -replace_old_iatt_in_dict (dict_t *xdata) -{ - int ret; - struct old_iatt *o_iatt; /* old iatt structure */ - struct iatt *c_iatt; /* current iatt */ - int32_t len = sizeof(struct old_iatt); - - if (!xdata) { - return 0; - } - - ret = dict_get_bin (xdata, DHT_IATT_IN_XDATA_KEY, (void **)&c_iatt); - if (ret < 0) { - return 0; - } - - o_iatt = GF_CALLOC (1, len, gf_common_mt_char); - if (!o_iatt) { - return -1; - } - - oldiatt_from_iatt (o_iatt, c_iatt); - - ret = dict_set_bin (xdata, DHT_IATT_IN_XDATA_KEY, o_iatt, len); - if (ret) { - GF_FREE (o_iatt); - } - - return ret; -} - -int gf_server_check_getxattr_cmd (call_frame_t *frame, const char *key) { @@ -2494,7 +2462,7 @@ server_populate_compound_response (xlator_t *this, gfs3_compound_rsp *rsp, rsp_args = &this_rsp->compound_rsp_u.compound_unlink_rsp; - if (replace_old_iatt_in_dict (this_args_cbk->xdata)) { + if (gf_replace_old_iatt_in_dict (this_args_cbk->xdata)) { rsp_args->op_errno = errno; rsp_args->op_ret = -1; goto out; @@ -2762,7 +2730,7 @@ server_populate_compound_response (xlator_t *this, gfs3_compound_rsp *rsp, rsp_args = &this_rsp->compound_rsp_u.compound_setxattr_rsp; - if (replace_old_iatt_in_dict (this_args_cbk->xdata)) { + if (gf_replace_old_iatt_in_dict (this_args_cbk->xdata)) { rsp_args->op_errno = errno; rsp_args->op_ret = -1; goto out; @@ -2806,7 +2774,7 @@ server_populate_compound_response (xlator_t *this, gfs3_compound_rsp *rsp, rsp_args = &this_rsp->compound_rsp_u.compound_removexattr_rsp; - if (replace_old_iatt_in_dict (this_args_cbk->xdata)) { + if (gf_replace_old_iatt_in_dict (this_args_cbk->xdata)) { rsp_args->op_errno = errno; rsp_args->op_ret = -1; goto out; @@ -3143,7 +3111,7 @@ server_populate_compound_response (xlator_t *this, gfs3_compound_rsp *rsp, rsp_args = &this_rsp->compound_rsp_u.compound_setxattr_rsp; - if (replace_old_iatt_in_dict (this_args_cbk->xdata)) { + if (gf_replace_old_iatt_in_dict (this_args_cbk->xdata)) { rsp_args->op_errno = errno; rsp_args->op_ret = -1; goto out; @@ -3253,7 +3221,7 @@ server_populate_compound_response (xlator_t *this, gfs3_compound_rsp *rsp, rsp_args = &this_rsp->compound_rsp_u.compound_fremovexattr_rsp; - if (replace_old_iatt_in_dict (this_args_cbk->xdata)) { + if (gf_replace_old_iatt_in_dict (this_args_cbk->xdata)) { rsp_args->op_errno = errno; rsp_args->op_ret = -1; goto out; diff --git a/xlators/protocol/server/src/server-helpers.h b/xlators/protocol/server/src/server-helpers.h index 73e2b89b21f..b89105a355f 100644 --- a/xlators/protocol/server/src/server-helpers.h +++ b/xlators/protocol/server/src/server-helpers.h @@ -74,8 +74,6 @@ getactivelkinfo_rsp_cleanup (gfs3_getactivelk_rsp *rsp); int getactivelkinfo_rsp_cleanup_v2 (gfx_getactivelk_rsp *rsp); -int replace_old_iatt_in_dict (dict_t *); - int server_populate_compound_response (xlator_t *this, gfs3_compound_rsp *rsp, call_frame_t *frame, diff --git a/xlators/protocol/server/src/server-rpc-fops.c b/xlators/protocol/server/src/server-rpc-fops.c index 690e1ebf890..7554984f80e 100644 --- a/xlators/protocol/server/src/server-rpc-fops.c +++ b/xlators/protocol/server/src/server-rpc-fops.c @@ -724,7 +724,7 @@ server_removexattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, server_state_t *state = NULL; gf_loglevel_t loglevel = GF_LOG_NONE; - if (replace_old_iatt_in_dict (xdata)) { + if (gf_replace_old_iatt_in_dict (xdata)) { op_errno = errno; op_ret = -1; goto out; @@ -772,7 +772,7 @@ server_fremovexattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, rpcsvc_request_t *req = NULL; server_state_t *state = NULL; - if (replace_old_iatt_in_dict (xdata)) { + if (gf_replace_old_iatt_in_dict (xdata)) { op_errno = errno; op_ret = -1; goto out; @@ -921,7 +921,7 @@ server_setxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, rpcsvc_request_t *req = NULL; server_state_t *state = NULL; - if (replace_old_iatt_in_dict (xdata)) { + if (gf_replace_old_iatt_in_dict (xdata)) { op_errno = errno; op_ret = -1; goto out; @@ -992,7 +992,7 @@ server_fsetxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, rpcsvc_request_t *req = NULL; server_state_t *state = NULL; - if (replace_old_iatt_in_dict (xdata)) { + if (gf_replace_old_iatt_in_dict (xdata)) { op_errno = errno; op_ret = -1; goto out; @@ -1090,7 +1090,7 @@ server_unlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this, server_state_t *state = NULL; rpcsvc_request_t *req = NULL; - if (replace_old_iatt_in_dict (xdata)) { + if (gf_replace_old_iatt_in_dict (xdata)) { op_errno = errno; op_ret = -1; goto out; |