diff options
| author | Kaushal M <kaushal@redhat.com> | 2015-04-10 13:02:59 +0530 |
|---|---|---|
| committer | Krishnan Parthasarathi <kparthas@redhat.com> | 2015-04-26 23:47:01 -0700 |
| commit | a1de3b05b3fd7514dbce5182c371c6be97819969 (patch) | |
| tree | 0f450b6faa2ccea4cee364d9094be67c3ded3c1b /xlators/mgmt/glusterd/src/glusterd-mgmt.h | |
| parent | 585b1f0d9e485674268cb90bd8f3fdb143bab06b (diff) | |
glusterd: Remove direct references to peerinfo in frame cookies
RCU protection requires that we don't have direct references to
protected data structures outside read-critical sections
This change was developed on the git branch at [1]. This commit is a
combination of the following commits on the development branch.
82ebfdd Remove direct references to peerinfo in frame cookies
dec4bec Remove incorrect and unneeded code from
gd_syncop_mgmt_v3_unlock_cbk_fn
7aced7b Use stack allocated uuid for frame cookie.
38e4124 Address comments from 10192/2
[1]: https://github.com/kshlm/glusterfs/tree/urcu
Change-Id: Ic50e5fca0be72af5090f4cf318efa55d29075de9
BUG: 1205186
Signed-off-by: Kaushal M <kaushal@redhat.com>
Reviewed-on: http://review.gluster.org/10192
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Tested-by: NetBSD Build System
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
Tested-by: Krishnan Parthasarathi <kparthas@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-mgmt.h')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-mgmt.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-mgmt.h b/xlators/mgmt/glusterd/src/glusterd-mgmt.h index ab9265c75c4..894bd198ff3 100644 --- a/xlators/mgmt/glusterd/src/glusterd-mgmt.h +++ b/xlators/mgmt/glusterd/src/glusterd-mgmt.h @@ -16,8 +16,8 @@ #endif void gd_mgmt_v3_collate_errors (struct syncargs *args, int op_ret, int op_errno, - char *op_errstr, int op_code, - glusterd_peerinfo_t *peerinfo, u_char *uuid); + char *op_errstr, int op_code, uuid_t peerid, + u_char *uuid); int32_t gd_mgmt_v3_pre_validate_fn (glusterd_op_t op, dict_t *dict, |