From c0d88596bda4eb5c7e942e621a7d38c7ae6d737a Mon Sep 17 00:00:00 2001

From: Sanju Rakonde <srakonde@redhat.com>

Date: Wed, 28 Nov 2018 16:13:58 +0530

Subject: [PATCH 477/493] glusterd: perform rcu_read_lock/unlock() under

 cleanup_lock mutex

Problem: glusterd should not try to acquire locks on any resources,

when it already received a SIGTERM and cleanup is started. Otherwise

we might hit segfault, since the thread which is going through

cleanup path will be freeing up the resouces and some other thread

might be trying to acquire locks on freed resources.

Solution: perform rcu_read_lock/unlock() under cleanup_lock mutex.

> fixes: bz#1654270

> Change-Id: I87a97cfe4f272f74f246d688660934638911ce54

> Signed-off-by: Sanju Rakonde <srakonde@redhat.com>

upstream patch: https://review.gluster.org/#/c/glusterfs/+/21743/

Change-Id: I87a97cfe4f272f74f246d688660934638911ce54

BUG: 1654161

Signed-off-by: Sanju Rakonde <srakonde@redhat.com>

Reviewed-on: https://code.engineering.redhat.com/gerrit/158647

Tested-by: RHGS Build Bot <nigelb@redhat.com>

Reviewed-by: Atin Mukherjee <amukherj@redhat.com>

---

 xlators/mgmt/glusterd/src/glusterd-brick-ops.c     |  8 +--

 xlators/mgmt/glusterd/src/glusterd-handler.c       | 75 +++++++++++-----------

 xlators/mgmt/glusterd/src/glusterd-handshake.c     | 32 ++++-----

 xlators/mgmt/glusterd/src/glusterd-mgmt.c          | 28 ++++----

 xlators/mgmt/glusterd/src/glusterd-op-sm.c         | 30 ++++-----

 xlators/mgmt/glusterd/src/glusterd-peer-utils.c    | 40 ++++++------

 xlators/mgmt/glusterd/src/glusterd-replace-brick.c |  4 +-

 xlators/mgmt/glusterd/src/glusterd-reset-brick.c   |  4 +-

 xlators/mgmt/glusterd/src/glusterd-rpc-ops.c       | 48 +++++++-------

 xlators/mgmt/glusterd/src/glusterd-server-quorum.c |  4 +-

 xlators/mgmt/glusterd/src/glusterd-sm.c            | 64 +++++++++---------

 xlators/mgmt/glusterd/src/glusterd-snapshot.c      |  6 +-

 xlators/mgmt/glusterd/src/glusterd-store.c         |  4 +-

 xlators/mgmt/glusterd/src/glusterd-syncop.c        | 40 ++++++------

 xlators/mgmt/glusterd/src/glusterd-utils.c         |  8 +--

 xlators/mgmt/glusterd/src/glusterd.h               | 20 +++++-

 16 files changed, 215 insertions(+), 200 deletions(-)

diff --git a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c

index 416412e..5ad8ab8 100644

--- a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c

+++ b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c

@@ -2097,7 +2097,7 @@ check:

                         continue;

                 }

-                rcu_read_lock ();

+                RCU_READ_LOCK;

                 peerinfo = glusterd_peerinfo_find_by_uuid

                                                 (brickinfo->uuid);

                 if (!peerinfo) {

@@ -2105,7 +2105,7 @@ check:

                                   "brick %s is not in cluster", brick);

                         *errstr = gf_strdup (msg);

                         ret = -1;

-                        rcu_read_unlock ();

+                        RCU_READ_UNLOCK;

                         goto out;

                 }

                 if (!peerinfo->connected) {

@@ -2113,10 +2113,10 @@ check:

                                   "brick %s is down", brick);

                         *errstr = gf_strdup (msg);

                         ret = -1;

-                        rcu_read_unlock ();

+                        RCU_READ_UNLOCK;

                         goto out;

                 }

-                rcu_read_unlock ();

+                RCU_READ_UNLOCK;

         }

 out:

diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c

index c71bf3c..d40de89 100644

--- a/xlators/mgmt/glusterd/src/glusterd-handler.c

+++ b/xlators/mgmt/glusterd/src/glusterd-handler.c

@@ -105,7 +105,7 @@ glusterd_handle_friend_req (rpcsvc_request_t *req, uuid_t  uuid,

         ret = glusterd_remote_hostname_get (req, rhost, sizeof (rhost));

-        rcu_read_lock ();

+        RCU_READ_LOCK;

         peerinfo = glusterd_peerinfo_find (uuid, rhost);

@@ -179,7 +179,7 @@ glusterd_handle_friend_req (rpcsvc_request_t *req, uuid_t  uuid,

                 ret = GLUSTERD_CONNECTION_AWAITED;

 out:

-        rcu_read_unlock ();

+        RCU_READ_UNLOCK;

         if (ret && (ret != GLUSTERD_CONNECTION_AWAITED)) {

                 if (ctx && ctx->hostname)

@@ -198,7 +198,6 @@ out:

                 GF_FREE (event);

         }

-

         return ret;

 }

@@ -214,7 +213,7 @@ glusterd_handle_unfriend_req (rpcsvc_request_t *req, uuid_t  uuid,

         if (!port)

                 port = GF_DEFAULT_BASE_PORT;

-        rcu_read_lock ();

+        RCU_READ_LOCK;

         peerinfo = glusterd_peerinfo_find (uuid, hostname);

@@ -269,7 +268,7 @@ glusterd_handle_unfriend_req (rpcsvc_request_t *req, uuid_t  uuid,

         ret = 0;

 out:

-        rcu_read_unlock ();

+        RCU_READ_UNLOCK;

         if (0 != ret) {

                 if (ctx && ctx->hostname)

@@ -902,9 +901,9 @@ __glusterd_handle_cluster_lock (rpcsvc_request_t *req)

         gf_msg_debug (this->name, 0, "Received LOCK from uuid: %s",

                 uuid_utoa (lock_req.uuid));

-        rcu_read_lock ();

+        RCU_READ_LOCK;

         ret = (glusterd_peerinfo_find_by_uuid (lock_req.uuid) == NULL);

-        rcu_read_unlock ();

+        RCU_READ_UNLOCK;

         if (ret) {

                 gf_msg (this->name, GF_LOG_WARNING, 0,

                         GD_MSG_PEER_NOT_FOUND, "%s doesn't "

@@ -1060,9 +1059,9 @@ __glusterd_handle_stage_op (rpcsvc_request_t *req)

         gf_msg_debug (this->name, 0, "transaction ID = %s",

                 uuid_utoa (*txn_id));

-        rcu_read_lock ();

+        RCU_READ_LOCK;

         ret = (glusterd_peerinfo_find_by_uuid (op_req.uuid) == NULL);

-        rcu_read_unlock ();

+        RCU_READ_UNLOCK;

         if (ret) {

                 gf_msg (this->name, GF_LOG_WARNING, 0,

                         GD_MSG_PEER_NOT_FOUND, "%s doesn't "

@@ -1144,9 +1143,9 @@ __glusterd_handle_commit_op (rpcsvc_request_t *req)

                 goto out;

         }

-        rcu_read_lock ();

+        RCU_READ_LOCK;

         ret = (glusterd_peerinfo_find_by_uuid (op_req.uuid) == NULL);

-        rcu_read_unlock ();

+        RCU_READ_UNLOCK;

         if (ret) {

                 gf_msg (this->name, GF_LOG_WARNING, 0,

                         GD_MSG_PEER_NOT_FOUND, "%s doesn't "

@@ -1270,12 +1269,12 @@ __glusterd_handle_cli_probe (rpcsvc_request_t *req)

                 goto out;

         }

-        rcu_read_lock ();

+        RCU_READ_LOCK;

         peerinfo = glusterd_peerinfo_find_by_hostname (hostname);

         ret = (peerinfo && gd_peer_has_address (peerinfo, hostname));

-        rcu_read_unlock ();

+        RCU_READ_UNLOCK;

         if (ret) {

                 gf_msg_debug ("glusterd", 0, "Probe host %s port %d "

@@ -2329,7 +2328,7 @@ __glusterd_handle_fsm_log (rpcsvc_request_t *req)

                 conf = this->private;

                 ret = glusterd_sm_tr_log_add_to_dict (dict, &conf->op_sm_log);

         } else {

-                rcu_read_lock ();

+                RCU_READ_LOCK;

                 peerinfo = glusterd_peerinfo_find_by_hostname (cli_req.name);

                 if (!peerinfo) {

@@ -2341,7 +2340,7 @@ __glusterd_handle_fsm_log (rpcsvc_request_t *req)

                                 (dict, &peerinfo->sm_log);

                 }

-                rcu_read_unlock ();

+                RCU_READ_UNLOCK;

         }

 out:

@@ -2482,9 +2481,9 @@ __glusterd_handle_cluster_unlock (rpcsvc_request_t *req)

         gf_msg_debug (this->name, 0,

                 "Received UNLOCK from uuid: %s", uuid_utoa (unlock_req.uuid));

-        rcu_read_lock ();

+        RCU_READ_LOCK;

         ret = (glusterd_peerinfo_find_by_uuid (unlock_req.uuid) == NULL);

-        rcu_read_unlock ();

+        RCU_READ_UNLOCK;

         if (ret) {

                 gf_msg (this->name, GF_LOG_WARNING, 0,

                         GD_MSG_PEER_NOT_FOUND, "%s doesn't "

@@ -2786,11 +2785,11 @@ __glusterd_handle_friend_update (rpcsvc_request_t *req)

         }

         ret = 0;

-        rcu_read_lock ();

+        RCU_READ_LOCK;

         if (glusterd_peerinfo_find (friend_req.uuid, NULL) == NULL) {

                 ret = -1;

         }

-        rcu_read_unlock ();

+        RCU_READ_UNLOCK;

         if (ret) {

                 gf_msg (this->name, GF_LOG_CRITICAL, 0,

                         GD_MSG_REQ_FROM_UNKNOWN_PEER,

@@ -2856,7 +2855,7 @@ __glusterd_handle_friend_update (rpcsvc_request_t *req)

                 memset (key, 0, sizeof (key));

                 snprintf (key, sizeof (key), "friend%d", i);

-                rcu_read_lock ();

+                RCU_READ_LOCK;

                 peerinfo = glusterd_peerinfo_find (uuid, NULL);

                 if (peerinfo == NULL) {

                         /* Create a new peer and add it to the list as there is

@@ -2903,7 +2902,7 @@ __glusterd_handle_friend_update (rpcsvc_request_t *req)

                         }

                 }

 unlock:

-                rcu_read_unlock ();

+                RCU_READ_UNLOCK;

                 if (ret)

                         break;

@@ -3002,7 +3001,7 @@ __glusterd_handle_probe_query (rpcsvc_request_t *req)

                 goto out;

         }

-        rcu_read_lock ();

+        RCU_READ_LOCK;

         peerinfo = glusterd_peerinfo_find (probe_req.uuid, remote_hostname);

         if ((peerinfo == NULL) && (!cds_list_empty (&conf->peers))) {

                 rsp.op_ret = -1;

@@ -3024,7 +3023,7 @@ __glusterd_handle_probe_query (rpcsvc_request_t *req)

                         rsp.op_errno = GF_PROBE_ADD_FAILED;

                 }

         }

-        rcu_read_unlock ();

+       RCU_READ_UNLOCK;

 respond:

         gf_uuid_copy (rsp.uuid, MY_UUID);

@@ -3370,11 +3369,11 @@ glusterd_friend_remove (uuid_t uuid, char *hostname)

         int                           ret = -1;

         glusterd_peerinfo_t           *peerinfo = NULL;

-        rcu_read_lock ();

+        RCU_READ_LOCK;

         peerinfo = glusterd_peerinfo_find (uuid, hostname);

         if (peerinfo == NULL) {

-                rcu_read_unlock ();

+                RCU_READ_UNLOCK;

                 goto out;

         }

@@ -3382,7 +3381,7 @@ glusterd_friend_remove (uuid_t uuid, char *hostname)

         if (ret)

                 gf_msg (THIS->name, GF_LOG_WARNING, 0,

                         GD_MSG_VOL_CLEANUP_FAIL, "Volumes cleanup failed");

-        rcu_read_unlock ();

+        RCU_READ_UNLOCK;

         /* Giving up the critical section here as glusterd_peerinfo_cleanup must

          * be called from outside a critical section

          */

@@ -3715,7 +3714,7 @@ glusterd_probe_begin (rpcsvc_request_t *req, const char *hoststr, int port,

         GF_ASSERT (hoststr);

-        rcu_read_lock ();

+        RCU_READ_LOCK;

         peerinfo = glusterd_peerinfo_find (NULL, hoststr);

         if (peerinfo == NULL) {

@@ -3763,7 +3762,7 @@ glusterd_probe_begin (rpcsvc_request_t *req, const char *hoststr, int port,

         }

 out:

-        rcu_read_unlock ();

+        RCU_READ_UNLOCK;

         gf_msg_debug ("glusterd", 0, "returning %d", ret);

         return ret;

 }

@@ -3780,7 +3779,7 @@ glusterd_deprobe_begin (rpcsvc_request_t *req, const char *hoststr, int port,

         GF_ASSERT (hoststr);

         GF_ASSERT (req);

-        rcu_read_lock ();

+        RCU_READ_LOCK;

         peerinfo = glusterd_peerinfo_find (uuid, hoststr);

         if (peerinfo == NULL) {

@@ -3840,7 +3839,7 @@ glusterd_deprobe_begin (rpcsvc_request_t *req, const char *hoststr, int port,

         peerinfo->detaching = _gf_true;

 out:

-        rcu_read_unlock ();

+        RCU_READ_UNLOCK;

         return ret;

 }

@@ -4162,7 +4161,7 @@ glusterd_list_friends (rpcsvc_request_t *req, dict_t *dict, int32_t flags)

         /* Reset ret to 0, needed to prevent failure incase no peers exist */

         ret = 0;

-        rcu_read_lock ();

+        RCU_READ_LOCK;

         if (!cds_list_empty (&priv->peers)) {

                 cds_list_for_each_entry_rcu (entry, &priv->peers, uuid_list) {

                         count++;

@@ -4173,7 +4172,7 @@ glusterd_list_friends (rpcsvc_request_t *req, dict_t *dict, int32_t flags)

                 }

         }

 unlock:

-        rcu_read_unlock ();

+        RCU_READ_UNLOCK;

         if (ret)

                 goto out;

@@ -5592,7 +5591,7 @@ glusterd_get_state (rpcsvc_request_t *req, dict_t *dict)

         if (priv->opts)

                 dict_foreach (priv->opts, glusterd_print_global_options, fp);

-        rcu_read_lock ();

+        RCU_READ_LOCK;

         fprintf (fp, "\n[Peers]\n");

         cds_list_for_each_entry_rcu (peerinfo, &priv->peers, uuid_list) {

@@ -5621,7 +5620,7 @@ glusterd_get_state (rpcsvc_request_t *req, dict_t *dict)

                 count_bkp = 0;

                 fprintf (fp, "\n");

         }

-        rcu_read_unlock ();

+        RCU_READ_UNLOCK;

         count = 0;

         fprintf (fp, "\n[Volumes]\n");

@@ -6259,7 +6258,7 @@ glusterd_friend_remove_notify (glusterd_peerctx_t *peerctx, int32_t op_errno)

         GF_ASSERT (peerctx);

-        rcu_read_lock ();

+        RCU_READ_LOCK;

         peerinfo = glusterd_peerinfo_find_by_generation (peerctx->peerinfo_gen);

         if (!peerinfo) {

                 gf_msg_debug (THIS->name, 0, "Could not find peer %s(%s). "

@@ -6300,7 +6299,7 @@ glusterd_friend_remove_notify (glusterd_peerctx_t *peerctx, int32_t op_errno)

         }

 out:

-        rcu_read_unlock ();

+        RCU_READ_UNLOCK;

         return ret;

 }

@@ -6340,7 +6339,7 @@ __glusterd_peer_rpc_notify (struct rpc_clnt *rpc, void *mydata,

                         peerctx->peername);

                 return 0;

         }

-        rcu_read_lock ();

+        RCU_READ_LOCK;

         peerinfo = glusterd_peerinfo_find_by_generation (peerctx->peerinfo_gen);

         if (!peerinfo) {

@@ -6466,7 +6465,7 @@ __glusterd_peer_rpc_notify (struct rpc_clnt *rpc, void *mydata,

         }

 out:

-        rcu_read_unlock ();

+        RCU_READ_UNLOCK;

         glusterd_friend_sm ();

         glusterd_op_sm ();

diff --git a/xlators/mgmt/glusterd/src/glusterd-handshake.c b/xlators/mgmt/glusterd/src/glusterd-handshake.c

index b2a9b20..d18a7a3 100644

--- a/xlators/mgmt/glusterd/src/glusterd-handshake.c

+++ b/xlators/mgmt/glusterd/src/glusterd-handshake.c

@@ -1140,9 +1140,9 @@ gd_validate_mgmt_hndsk_req (rpcsvc_request_t *req, dict_t *dict)

          */

         if (!ret) {

                 gf_uuid_parse (uuid_str, peer_uuid);

-                rcu_read_lock ();

+                RCU_READ_LOCK;

                 ret = (glusterd_peerinfo_find (peer_uuid, NULL) != NULL);

-                rcu_read_unlock ();

+                RCU_READ_UNLOCK;

                 if (ret)

                         return _gf_true;

         }

@@ -1158,7 +1158,7 @@ gd_validate_mgmt_hndsk_req (rpcsvc_request_t *req, dict_t *dict)

          * is available in the peerinfo list but the uuid has changed of the

          * node due to a reinstall, in that case the validation should fail!

          */

-        rcu_read_lock ();

+        RCU_READ_LOCK;

         if (!uuid_str) {

                 ret = (glusterd_peerinfo_find (NULL, hostname) == NULL);

         } else {

@@ -1177,7 +1177,7 @@ gd_validate_mgmt_hndsk_req (rpcsvc_request_t *req, dict_t *dict)

                         ret = -1;

                 }

         }

-        rcu_read_unlock ();

+        RCU_READ_UNLOCK;

         if (ret) {

                 gf_msg (this->name, GF_LOG_ERROR, 0,

                         GD_MSG_HANDSHAKE_REQ_REJECTED, "Rejecting management "

@@ -1728,7 +1728,7 @@ glusterd_event_connected_inject (glusterd_peerctx_t *peerctx)

                 goto out;

         }

-        rcu_read_lock ();

+        RCU_READ_LOCK;

         peerinfo = glusterd_peerinfo_find_by_generation (peerctx->peerinfo_gen);

         if (!peerinfo) {

@@ -1754,7 +1754,7 @@ glusterd_event_connected_inject (glusterd_peerctx_t *peerctx)

                         GD_MSG_EVENT_INJECT_FAIL, "Unable to inject "

                         "EVENT_CONNECTED ret = %d", ret);

 unlock:

-        rcu_read_unlock ();

+        RCU_READ_UNLOCK;

 out:

         gf_msg_debug ("glusterd", 0, "returning %d", ret);

@@ -1824,7 +1824,7 @@ __glusterd_mgmt_hndsk_version_ack_cbk (struct rpc_req *req, struct iovec *iov,

         frame = myframe;

         peerctx = frame->local;

-        rcu_read_lock ();

+        RCU_READ_LOCK;

         peerinfo = glusterd_peerinfo_find_by_generation (peerctx->peerinfo_gen);

         if (!peerinfo) {

                 gf_msg_debug (this->name, 0, "Could not find peer %s(%s)",

@@ -1887,7 +1887,7 @@ out:

         if (ret != 0 && peerinfo)

                 rpc_transport_disconnect (peerinfo->rpc->conn.trans, _gf_false);

-        rcu_read_unlock ();

+        RCU_READ_UNLOCK;

         frame->local = NULL;

         STACK_DESTROY (frame->root);

@@ -1930,7 +1930,7 @@ __glusterd_mgmt_hndsk_version_cbk (struct rpc_req *req, struct iovec *iov,

         frame = myframe;

         peerctx = frame->local;

-        rcu_read_lock ();

+        RCU_READ_LOCK;

         peerinfo = glusterd_peerinfo_find_by_generation (peerctx->peerinfo_gen);

         if (!peerinfo) {

@@ -2014,7 +2014,7 @@ out:

                                                   _gf_false);

         }

-        rcu_read_unlock ();

+        RCU_READ_UNLOCK;

         if (rsp.hndsk.hndsk_val)

                 free (rsp.hndsk.hndsk_val);

@@ -2070,7 +2070,7 @@ glusterd_mgmt_handshake (xlator_t *this, glusterd_peerctx_t *peerctx)

         GF_PROTOCOL_DICT_SERIALIZE (this, req_dict, (&req.hndsk.hndsk_val),

                                     req.hndsk.hndsk_len, ret, out);

-        rcu_read_lock ();

+        RCU_READ_LOCK;

         peerinfo = glusterd_peerinfo_find_by_generation (peerctx->peerinfo_gen);

         if (!peerinfo) {

@@ -2086,7 +2086,7 @@ glusterd_mgmt_handshake (xlator_t *this, glusterd_peerctx_t *peerctx)

                                        (xdrproc_t)xdr_gf_mgmt_hndsk_req);

         ret = 0;

 unlock:

-        rcu_read_unlock ();

+        RCU_READ_UNLOCK;

 out:

         if (ret && frame)

                 STACK_DESTROY (frame->root);

@@ -2202,7 +2202,7 @@ __glusterd_peer_dump_version_cbk (struct rpc_req *req, struct iovec *iov,

         frame = myframe;

         peerctx = frame->local;

-        rcu_read_lock ();

+        RCU_READ_LOCK;

         peerinfo = glusterd_peerinfo_find_by_generation (peerctx->peerinfo_gen);

         if (!peerinfo) {

@@ -2282,7 +2282,7 @@ out:

         if (ret != 0 && peerinfo)

                 rpc_transport_disconnect (peerinfo->rpc->conn.trans, _gf_false);

-        rcu_read_unlock ();

+        RCU_READ_UNLOCK;

         glusterd_friend_sm ();

         glusterd_op_sm ();

@@ -2330,7 +2330,7 @@ glusterd_peer_dump_version (xlator_t *this, struct rpc_clnt *rpc,

         if (!peerctx)

                 goto out;

-        rcu_read_lock ();

+        RCU_READ_LOCK;

         peerinfo = glusterd_peerinfo_find_by_generation (peerctx->peerinfo_gen);

         if (!peerinfo) {

@@ -2347,7 +2347,7 @@ glusterd_peer_dump_version (xlator_t *this, struct rpc_clnt *rpc,

                                        glusterd_peer_dump_version_cbk,

                                        (xdrproc_t)xdr_gf_dump_req);

 unlock:

-        rcu_read_unlock ();

+        RCU_READ_UNLOCK;

 out:

         if (ret && frame)

                 STACK_DESTROY (frame->root);

diff --git a/xlators/mgmt/glusterd/src/glusterd-mgmt.c b/xlators/mgmt/glusterd/src/glusterd-mgmt.c

index 751d6e4..d98c6bc 100644

--- a/xlators/mgmt/glusterd/src/glusterd-mgmt.c

+++ b/xlators/mgmt/glusterd/src/glusterd-mgmt.c

@@ -52,14 +52,14 @@ gd_mgmt_v3_collate_errors (struct syncargs *args, int op_ret, int op_errno,

                 args->op_ret = op_ret;

                 args->op_errno = op_errno;

-                rcu_read_lock ();

+                RCU_READ_LOCK;

                 peerinfo = glusterd_peerinfo_find (peerid, NULL);

                 if (peerinfo)

                         peer_str = gf_strdup (peerinfo->hostname);

                 else

                         peer_str = gf_strdup (uuid_utoa (uuid));

-                rcu_read_unlock ();

+                RCU_READ_UNLOCK;

                 is_operrstr_blk = (op_errstr && strcmp (op_errstr, ""));

                 err_string     = (is_operrstr_blk) ? op_errstr : err_str;

@@ -761,7 +761,7 @@ glusterd_mgmt_v3_initiate_lockdown (glusterd_op_t op, dict_t *dict,

         synctask_barrier_init((&args));

         peer_cnt = 0;

-        rcu_read_lock ();

+        RCU_READ_LOCK;

         cds_list_for_each_entry_rcu (peerinfo, &conf->peers, uuid_list) {

                 /* Only send requests to peers who were available before the

                  * transaction started

@@ -779,7 +779,7 @@ glusterd_mgmt_v3_initiate_lockdown (glusterd_op_t op, dict_t *dict,

                                  MY_UUID, peer_uuid);

                 peer_cnt++;

         }

-        rcu_read_unlock ();

+        RCU_READ_UNLOCK;

         if (0 == peer_cnt) {

                 ret = 0;

@@ -1126,7 +1126,7 @@ glusterd_mgmt_v3_pre_validate (glusterd_op_t op, dict_t *req_dict,

         synctask_barrier_init((&args));

         peer_cnt = 0;

-        rcu_read_lock ();

+        RCU_READ_LOCK;

         cds_list_for_each_entry_rcu (peerinfo, &conf->peers, uuid_list) {

                 /* Only send requests to peers who were available before the

                  * transaction started

@@ -1144,7 +1144,7 @@ glusterd_mgmt_v3_pre_validate (glusterd_op_t op, dict_t *req_dict,

                                              MY_UUID, peer_uuid);

                 peer_cnt++;

         }

-        rcu_read_unlock ();

+        RCU_READ_UNLOCK;

         if (0 == peer_cnt) {

                 ret = 0;

@@ -1401,7 +1401,7 @@ glusterd_mgmt_v3_brick_op (glusterd_op_t op, dict_t *rsp_dict, dict_t *req_dict,

         synctask_barrier_init((&args));

         peer_cnt = 0;

-        rcu_read_lock ();

+        RCU_READ_LOCK;

         cds_list_for_each_entry_rcu (peerinfo, &conf->peers, uuid_list) {

                 /* Only send requests to peers who were available before the

                  * transaction started

@@ -1419,7 +1419,7 @@ glusterd_mgmt_v3_brick_op (glusterd_op_t op, dict_t *rsp_dict, dict_t *req_dict,

                                          MY_UUID, peer_uuid);

                 peer_cnt++;

         }

-        rcu_read_unlock ();

+        RCU_READ_UNLOCK;

         if (0 == peer_cnt) {

                 ret = 0;

@@ -1667,7 +1667,7 @@ glusterd_mgmt_v3_commit (glusterd_op_t op, dict_t *op_ctx, dict_t *req_dict,

         synctask_barrier_init((&args));

         peer_cnt = 0;

-        rcu_read_lock ();

+        RCU_READ_LOCK;

         cds_list_for_each_entry_rcu (peerinfo, &conf->peers, uuid_list) {

                 /* Only send requests to peers who were available before the

                  * transaction started

@@ -1702,7 +1702,7 @@ glusterd_mgmt_v3_commit (glusterd_op_t op, dict_t *op_ctx, dict_t *req_dict,

                                        MY_UUID, peer_uuid);

                 peer_cnt++;

         }

-        rcu_read_unlock ();

+        RCU_READ_UNLOCK;

         if (0 == peer_cnt) {

                 ret = 0;

@@ -1912,7 +1912,7 @@ glusterd_mgmt_v3_post_validate (glusterd_op_t op, int32_t op_ret, dict_t *dict,

         synctask_barrier_init((&args));

         peer_cnt = 0;

-        rcu_read_lock ();

+        RCU_READ_LOCK;

         cds_list_for_each_entry_rcu (peerinfo, &conf->peers, uuid_list) {

                 /* Only send requests to peers who were available before the

                  * transaction started

@@ -1930,7 +1930,7 @@ glusterd_mgmt_v3_post_validate (glusterd_op_t op, int32_t op_ret, dict_t *dict,

                                               &args, MY_UUID, peer_uuid);

                 peer_cnt++;

         }

-        rcu_read_unlock ();

+        RCU_READ_UNLOCK;

         if (0 == peer_cnt) {

                 ret = 0;

@@ -2094,7 +2094,7 @@ glusterd_mgmt_v3_release_peer_locks (glusterd_op_t op, dict_t *dict,

         synctask_barrier_init((&args));

         peer_cnt = 0;

-        rcu_read_lock ();

+        RCU_READ_LOCK;

         cds_list_for_each_entry_rcu (peerinfo, &conf->peers, uuid_list) {

                 /* Only send requests to peers who were available before the

                  * transaction started

@@ -2112,7 +2112,7 @@ glusterd_mgmt_v3_release_peer_locks (glusterd_op_t op, dict_t *dict,

                                    MY_UUID, peer_uuid);

                 peer_cnt++;

         }

-        rcu_read_unlock ();

+        RCU_READ_UNLOCK;

         if (0 == peer_cnt) {

                 ret = 0;

diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c

index 9f76ab3..6414a4e 100644

--- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c

+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c

@@ -1825,7 +1825,7 @@ glusterd_op_stage_sync_volume (dict_t *dict, char **op_errstr)

                         ret = 0;

                 }

          } else {

-                 rcu_read_lock ();

+                 RCU_READ_LOCK;

                  peerinfo = glusterd_peerinfo_find (NULL, hostname);

                  if (peerinfo == NULL) {

@@ -1841,7 +1841,7 @@ glusterd_op_stage_sync_volume (dict_t *dict, char **op_errstr)

                          ret = -1;

                  }

-                 rcu_read_unlock ();

+                 RCU_READ_UNLOCK;

         }

 out:

@@ -3964,7 +3964,7 @@ glusterd_op_ac_send_lock (glusterd_op_sm_event_t *event, void *ctx)

         priv = this->private;

         GF_ASSERT (priv);

-        rcu_read_lock ();

+        RCU_READ_LOCK;

         cds_list_for_each_entry_rcu (peerinfo, &priv->peers, uuid_list) {

                 /* Only send requests to peers who were available before the

                  * transaction started

@@ -3985,7 +3985,7 @@ glusterd_op_ac_send_lock (glusterd_op_sm_event_t *event, void *ctx)

                         if (proc->fn) {

                                 ret = proc->fn (NULL, this, peerinfo);

                                 if (ret) {

-                                        rcu_read_unlock ();

+                                        RCU_READ_UNLOCK;

                                         gf_msg (this->name, GF_LOG_WARNING, 0,

                                                 GD_MSG_LOCK_REQ_SEND_FAIL,

                                                 "Failed to send lock request "

@@ -4009,7 +4009,7 @@ glusterd_op_ac_send_lock (glusterd_op_sm_event_t *event, void *ctx)

                                 ret = dict_set_static_ptr (dict, "peerinfo",

                                                            peerinfo);

                                 if (ret) {

-                                        rcu_read_unlock ();

+                                        RCU_READ_UNLOCK;

                                         gf_msg (this->name, GF_LOG_ERROR, 0,

                                                 GD_MSG_DICT_SET_FAILED,

                                                 "failed to set peerinfo");

@@ -4019,7 +4019,7 @@ glusterd_op_ac_send_lock (glusterd_op_sm_event_t *event, void *ctx)

                                 ret = proc->fn (NULL, this, dict);

                                 if (ret) {

-                                        rcu_read_unlock ();

+                                        RCU_READ_UNLOCK;

                                         gf_msg (this->name, GF_LOG_WARNING, 0,