|
 |
3604df |
From d7e3e0557c0dc3367d6d9663079f5cd817ca3de6 Mon Sep 17 00:00:00 2001
|
|
|
3604df |
From: Jeff Darcy <jdarcy@redhat.com>
|
|
|
3604df |
Date: Tue, 3 May 2016 09:29:46 -0400
|
|
|
3604df |
Subject: [PATCH 76/86] protocol/client: fix coding style violations
|
|
|
3604df |
|
|
|
3604df |
Backport of: http://review.gluster.org/14192
|
|
|
3604df |
|
|
|
3604df |
Commit 45fa52d7 added some massive violations of our 80-column rule.
|
|
|
3604df |
This commit fixes them.
|
|
|
3604df |
|
|
|
3604df |
Change-Id: I531ad5950d83097efa8aea946652dca6702f93a5
|
|
|
3604df |
BUG: 1360978
|
|
|
3604df |
Signed-off-by: Jeff Darcy <jdarcy@redhat.com>
|
|
|
3604df |
Reviewed-on: https://code.engineering.redhat.com/gerrit/84813
|
|
|
3604df |
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
|
|
|
3604df |
Tested-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
|
|
|
3604df |
---
|
|
|
3604df |
xlators/protocol/client/src/client.h | 69 ++++++++++++++++++----------------
|
|
|
3604df |
1 files changed, 37 insertions(+), 32 deletions(-)
|
|
|
3604df |
|
|
|
3604df |
diff --git a/xlators/protocol/client/src/client.h b/xlators/protocol/client/src/client.h
|
|
|
3604df |
index 46a7875..c2b8d54 100644
|
|
|
3604df |
--- a/xlators/protocol/client/src/client.h
|
|
|
3604df |
+++ b/xlators/protocol/client/src/client.h
|
|
|
3604df |
@@ -43,45 +43,50 @@ typedef enum {
|
|
|
3604df |
FALLBACK_TO_ANON_FD = 1
|
|
|
3604df |
} clnt_remote_fd_flags_t;
|
|
|
3604df |
|
|
|
3604df |
-#define CLIENT_POST_FOP(fop, this_rsp_u, this_args_cbk, params ...) \
|
|
|
3604df |
- do { \
|
|
|
3604df |
- gf_common_rsp *_this_rsp = &this_rsp_u->compound_rsp_u.compound_##fop##_rsp; \
|
|
|
3604df |
- int _op_ret = 0; \
|
|
|
3604df |
- int _op_errno = 0; \
|
|
|
3604df |
- \
|
|
|
3604df |
- _op_ret = _this_rsp->op_ret; \
|
|
|
3604df |
- _op_errno = gf_error_to_errno (_this_rsp->op_errno); \
|
|
|
3604df |
- args_##fop##_cbk_store (this_args_cbk, _op_ret, _op_errno, params); \
|
|
|
3604df |
+#define CPD_REQ_FIELD(v, f) ((v)->compound_req_u.compound_##f##_req)
|
|
|
3604df |
+#define CPD_RSP_FIELD(v, f) ((v)->compound_rsp_u.compound_##f##_rsp)
|
|
|
3604df |
+
|
|
|
3604df |
+#define CLIENT_POST_FOP(fop, this_rsp_u, this_args_cbk, params ...) \
|
|
|
3604df |
+ do { \
|
|
|
3604df |
+ gf_common_rsp *_this_rsp = &CPD_RSP_FIELD(this_rsp_u, fop); \
|
|
|
3604df |
+ int _op_ret = 0; \
|
|
|
3604df |
+ int _op_errno = 0; \
|
|
|
3604df |
+ \
|
|
|
3604df |
+ _op_ret = _this_rsp->op_ret; \
|
|
|
3604df |
+ _op_errno = gf_error_to_errno (_this_rsp->op_errno); \
|
|
|
3604df |
+ args_##fop##_cbk_store (this_args_cbk, _op_ret, _op_errno, \
|
|
|
3604df |
+ params); \
|
|
|
3604df |
} while (0)
|
|
|
3604df |
|
|
|
3604df |
-#define CLIENT_POST_FOP_TYPE(fop, this_rsp_u, this_args_cbk, params ...) \
|
|
|
3604df |
- do { \
|
|
|
3604df |
- gfs3_##fop##_rsp *_this_rsp = &this_rsp_u->compound_rsp_u.compound_##fop##_rsp; \
|
|
|
3604df |
- int _op_ret = 0; \
|
|
|
3604df |
- int _op_errno = 0; \
|
|
|
3604df |
- \
|
|
|
3604df |
- _op_ret = _this_rsp->op_ret; \
|
|
|
3604df |
- _op_errno = gf_error_to_errno (_this_rsp->op_errno); \
|
|
|
3604df |
- args_##fop##_cbk_store (this_args_cbk, _op_ret, _op_errno, params); \
|
|
|
3604df |
+#define CLIENT_POST_FOP_TYPE(fop, this_rsp_u, this_args_cbk, params ...) \
|
|
|
3604df |
+ do { \
|
|
|
3604df |
+ gfs3_##fop##_rsp * _this_rsp = &CPD_RSP_FIELD(this_rsp_u, fop);\
|
|
|
3604df |
+ int _op_ret = 0; \
|
|
|
3604df |
+ int _op_errno = 0; \
|
|
|
3604df |
+ \
|
|
|
3604df |
+ _op_ret = _this_rsp->op_ret; \
|
|
|
3604df |
+ _op_errno = gf_error_to_errno (_this_rsp->op_errno); \
|
|
|
3604df |
+ args_##fop##_cbk_store (this_args_cbk, _op_ret, _op_errno, \
|
|
|
3604df |
+ params); \
|
|
|
3604df |
} while (0)
|
|
|
3604df |
|
|
|
3604df |
-#define CLIENT_PRE_FOP(fop, xl, compound_req, op_errno, label, params ...) \
|
|
|
3604df |
- do { \
|
|
|
3604df |
+#define CLIENT_PRE_FOP(fop, xl, compound_req, op_errno, label, params ...) \
|
|
|
3604df |
+ do { \
|
|
|
3604df |
gfs3_##fop##_req *_req = (gfs3_##fop##_req *) compound_req; \
|
|
|
3604df |
- int _ret = 0; \
|
|
|
3604df |
- \
|
|
|
3604df |
- _ret = client_pre_##fop (xl, _req, params); \
|
|
|
3604df |
- if (_ret < 0) { \
|
|
|
3604df |
- op_errno = -ret; \
|
|
|
3604df |
- goto label; \
|
|
|
3604df |
- } \
|
|
|
3604df |
+ int _ret = 0; \
|
|
|
3604df |
+ \
|
|
|
3604df |
+ _ret = client_pre_##fop (xl, _req, params); \
|
|
|
3604df |
+ if (_ret < 0) { \
|
|
|
3604df |
+ op_errno = -ret; \
|
|
|
3604df |
+ goto label; \
|
|
|
3604df |
+ } \
|
|
|
3604df |
} while (0)
|
|
|
3604df |
|
|
|
3604df |
-#define CLIENT_COMPOUND_FOP_CLEANUP(curr_req, fop) \
|
|
|
3604df |
- do { \
|
|
|
3604df |
- gfs3_##fop##_req *_req = &curr_req->compound_req_u.compound_##fop##_req;\
|
|
|
3604df |
- \
|
|
|
3604df |
- GF_FREE (_req->xdata.xdata_val); \
|
|
|
3604df |
+#define CLIENT_COMPOUND_FOP_CLEANUP(curr_req, fop) \
|
|
|
3604df |
+ do { \
|
|
|
3604df |
+ gfs3_##fop##_req * _req = &CPD_REQ_FIELD(curr_req, fop); \
|
|
|
3604df |
+ \
|
|
|
3604df |
+ GF_FREE (_req->xdata.xdata_val); \
|
|
|
3604df |
} while (0)
|
|
|
3604df |
|
|
|
3604df |
#define CLIENT_GET_REMOTE_FD(xl, fd, flags, remote_fd, op_errno, label) \
|
|
|
3604df |
--
|
|
|
3604df |
1.7.1
|
|
|
3604df |
|