diff options
| author | Vijay Bellur <vbellur@redhat.com> | 2019-02-27 16:02:43 -0800 |
|---|---|---|
| committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2019-04-12 13:08:28 +0000 |
| commit | c261eb6c1fa41b6a0eadabbb3a2f64dc194ec254 (patch) | |
| tree | 93eb38d3e003c998a53844cc7a0081d1a9cf9b40 /xlators | |
| parent | 0e1223491e964096384edfae5032ed0d50d028ad (diff) | |
Replace memdup() with gf_memdup()
memdup() and gf_memdup() have the same implementation. Removed one API
as the presence of both can be confusing.
Change-Id: I562130c668457e13e4288e592792872d2e49887e
updates: bz#1193929
Signed-off-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/cluster/afr/src/afr-self-heald.c | 2 | ||||
| -rw-r--r-- | xlators/lib/src/libxlator.c | 6 | ||||
| -rw-r--r-- | xlators/protocol/client/src/client-helpers.c | 2 | ||||
| -rw-r--r-- | xlators/protocol/server/src/server-handshake.c | 3 |
4 files changed, 6 insertions, 7 deletions
diff --git a/xlators/cluster/afr/src/afr-self-heald.c b/xlators/cluster/afr/src/afr-self-heald.c index fe8ca026781..29714f5a90b 100644 --- a/xlators/cluster/afr/src/afr-self-heald.c +++ b/xlators/cluster/afr/src/afr-self-heald.c @@ -387,7 +387,7 @@ afr_shd_sweep_done(struct subvol_healer *healer) shd = &(((afr_private_t *)healer->this->private)->shd); time(&event->end_time); - history = memdup(event, sizeof(*event)); + history = gf_memdup(event, sizeof(*event)); event->start_time = 0; if (!history) diff --git a/xlators/lib/src/libxlator.c b/xlators/lib/src/libxlator.c index 075229dae76..724ceef5f2a 100644 --- a/xlators/lib/src/libxlator.c +++ b/xlators/lib/src/libxlator.c @@ -267,17 +267,17 @@ cluster_markeruuid_cbk(call_frame_t *frame, void *cookie, xlator_t *this, goto unlock; } else if (volmark->retval) { GF_FREE(local->volmark); - local->volmark = memdup(volmark, sizeof(*volmark)); + local->volmark = gf_memdup(volmark, sizeof(*volmark)); local->retval = volmark->retval; } else if ((volmark->sec > local->volmark->sec) || ((volmark->sec == local->volmark->sec) && (volmark->usec >= local->volmark->usec))) { GF_FREE(local->volmark); - local->volmark = memdup(volmark, sizeof(*volmark)); + local->volmark = gf_memdup(volmark, sizeof(*volmark)); } } else { - local->volmark = memdup(volmark, sizeof(*volmark)); + local->volmark = gf_memdup(volmark, sizeof(*volmark)); VALIDATE_OR_GOTO(local->volmark, unlock); gf_uuid_unparse(volmark->uuid, vol_uuid); if (volmark->retval) diff --git a/xlators/protocol/client/src/client-helpers.c b/xlators/protocol/client/src/client-helpers.c index 53b4484ecc8..42b5410ba07 100644 --- a/xlators/protocol/client/src/client-helpers.c +++ b/xlators/protocol/client/src/client-helpers.c @@ -209,7 +209,7 @@ unserialize_rsp_direntp(xlator_t *this, fd_t *fd, struct gfs3_readdirp_rsp *rsp, if (trav->dict.dict_val) { /* Dictionary is sent along with response */ - buf = memdup(trav->dict.dict_val, trav->dict.dict_len); + buf = gf_memdup(trav->dict.dict_val, trav->dict.dict_len); if (!buf) goto out; diff --git a/xlators/protocol/server/src/server-handshake.c b/xlators/protocol/server/src/server-handshake.c index 382f2410ee8..a0ff16349b3 100644 --- a/xlators/protocol/server/src/server-handshake.c +++ b/xlators/protocol/server/src/server-handshake.c @@ -36,7 +36,6 @@ gf_compare_client_version(rpcsvc_request_t *req, int fop_prognum, return ret; } - int server_getspec(rpcsvc_request_t *req) { @@ -267,7 +266,7 @@ server_setvolume(rpcsvc_request_t *req) */ config_params = dict_copy_with_ref(this->options, NULL); - buf = memdup(args.dict.dict_val, args.dict.dict_len); + buf = gf_memdup(args.dict.dict_val, args.dict.dict_len); if (buf == NULL) { op_ret = -1; op_errno = ENOMEM; |