diff options
| author | Yaniv Kaul <ykaul@redhat.com> | 2019-07-30 10:15:42 +0300 |
|---|---|---|
| committer | Atin Mukherjee <amukherj@redhat.com> | 2019-08-05 03:08:13 +0000 |
| commit | 2aeb9fb17087434d87497a85077073ea3bf94869 (patch) | |
| tree | 3625e683a27b8719ee97d89702815c89b6c5d2e4 /xlators/mgmt/glusterd/src/glusterd-brick-ops.c | |
| parent | 2dd43d3e5b5305db3a5ecafabdd9cf8e7775ec75 (diff) | |
multiple files: reduce minor work under RCU_READ_LOCK
1. Try to unlock faster - in error paths.
2. Remove memory allocations - do them before the lock.
Change-Id: I1e9ddd80b99de45ad0f557d62a5f28951dfd54c8
updates: bz#1193929
Signed-off-by: Yaniv Kaul <ykaul@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-brick-ops.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-brick-ops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c index 20ca14ca6d7..870e30d8f22 100644 --- a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c +++ b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c @@ -1662,23 +1662,23 @@ glusterd_remove_brick_validate_bricks(gf1_op_commands cmd, int32_t brick_count, RCU_READ_LOCK; peerinfo = glusterd_peerinfo_find_by_uuid(brickinfo->uuid); if (!peerinfo) { + RCU_READ_UNLOCK; snprintf(msg, sizeof(msg), "Host node of the " "brick %s is not in cluster", brick); *errstr = gf_strdup(msg); ret = -1; - RCU_READ_UNLOCK; goto out; } if (!peerinfo->connected) { + RCU_READ_UNLOCK; snprintf(msg, sizeof(msg), "Host node of the " "brick %s is down", brick); *errstr = gf_strdup(msg); ret = -1; - RCU_READ_UNLOCK; goto out; } RCU_READ_UNLOCK; |