summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
authorHarshavardhana <harsha@harshavardhana.net>2014-06-13 18:50:44 -0700
committerVijay Bellur <vbellur@redhat.com>2014-06-17 23:16:57 -0700
commitd0657d2989c1ba50ff76f15223ed9ce6a20a8682 (patch)
tree17dd1bcbe616d5dd044878c32e5caecd5db28427 /xlators
parentb6c8b1b47838228611e1a619890effe8b2dd2ad3 (diff)
glusterd: Avoid simple inline function definitions with local scope
C99/clang treats simple 'inline' function definitions as external scoped functions - this leads to flat_namespace issue on OSX. Avoid them by making them 'static inline' instead. Change-Id: I03deb4a72e0ba16e5e21e9739792b777898b67ed BUG: 1089172 Signed-off-by: Harshavardhana <harsha@harshavardhana.net> Reviewed-on: http://review.gluster.org/8067 Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Atin Mukherjee <amukherj@redhat.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'xlators')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-utils.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index fddd1f8f5dc..d89eba6a4ab 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -5814,7 +5814,7 @@ out:
return rpc;
}
-inline struct rpc_clnt*
+static inline struct rpc_clnt*
glusterd_snapd_get_rpc (glusterd_volinfo_t *volinfo)
{
return volinfo->snapd.rpc;
@@ -13215,7 +13215,7 @@ glusterd_snapd_set_online_status (glusterd_volinfo_t *volinfo,
volinfo->snapd.online = status;
}
-inline void
+static inline void
glusterd_snapd_set_rpc (glusterd_volinfo_t *volinfo, struct rpc_clnt *rpc)
{
volinfo->snapd.rpc = rpc;
@@ -13265,7 +13265,8 @@ glusterd_snapd_disconnect (glusterd_volinfo_t *volinfo)
glusterd_conf_t *priv = THIS->private;
rpc = glusterd_snapd_get_rpc (volinfo);
- (void)glusterd_snapd_set_rpc (volinfo, NULL);
+
+ (void) glusterd_snapd_set_rpc (volinfo, NULL);
if (rpc)
glusterd_rpc_clnt_unref (priv, rpc);