Multiple files: calloc -> malloc

xlators/storage/posix/src/posix-inode-fd-ops.c:
xlators/storage/posix/src/posix-helpers.c:
xlators/storage/bd/src/bd.c:
xlators/protocol/client/src/client-lk.c:
xlators/performance/quick-read/src/quick-read.c:
xlators/performance/io-cache/src/page.c
xlators/nfs/server/src/nfs3-helpers.c
xlators/nfs/server/src/nfs-fops.c
xlators/nfs/server/src/mount3udp_svc.c
xlators/nfs/server/src/mount3.c
xlators/mount/fuse/src/fuse-helpers.c
xlators/mount/fuse/src/fuse-bridge.c
xlators/mgmt/glusterd/src/glusterd-utils.c
xlators/mgmt/glusterd/src/glusterd-syncop.h
xlators/mgmt/glusterd/src/glusterd-snapshot.c
xlators/mgmt/glusterd/src/glusterd-rpc-ops.c
xlators/mgmt/glusterd/src/glusterd-replace-brick.c
xlators/mgmt/glusterd/src/glusterd-op-sm.c
xlators/mgmt/glusterd/src/glusterd-mgmt.c
xlators/meta/src/subvolumes-dir.c
xlators/meta/src/graph-dir.c
xlators/features/trash/src/trash.c
xlators/features/shard/src/shard.h
xlators/features/shard/src/shard.c
xlators/features/marker/src/marker-quota.c
xlators/features/locks/src/common.c
xlators/features/leases/src/leases-internal.c
xlators/features/gfid-access/src/gfid-access.c
xlators/features/cloudsync/src/cloudsync-plugins/src/cloudsyncs3/src/libcloudsyncs3.c
xlators/features/bit-rot/src/bitd/bit-rot.c
xlators/features/bit-rot/src/bitd/bit-rot-scrub.c
bxlators/encryption/crypt/src/metadata.c
xlators/encryption/crypt/src/crypt.c
xlators/performance/md-cache/src/md-cache.c:

Move to GF_MALLOC() instead of GF_CALLOC() when possible

It doesn't make sense to calloc (allocate and clear) memory
when the code right away fills that memory with data.
It may be optimized by the compiler, or have a microscopic
performance improvement.

In some cases, also changed allocation size to be sizeof some
struct or type instead of a pointer - easier to read.
In some cases, removed redundant strlen() calls by saving the result
into a variable.

1. Only done for the straightforward cases. There's room for improvement.
2. Please review carefully, especially for string allocation, with the
terminating NULL string.

Only compile-tested!

.. and allocate memory as much as needed.

xlators/nfs/server/src/mount3.c :

Don't blindly allocate PATH_MAX, but strlen() the string and allocate
appropriately.
Also, align error messges.

updates: bz#1193929
Original-Author: Yaniv Kaul <ykaul@redhat.com>
Signed-off-by: Yaniv Kaul <ykaul@redhat.com>
Signed-off-by: Yaniv Kaul <ykaul@redhat.com>
Change-Id: Ibda6f33dd180b7f7694f20a12af1e9576fe197f5

7 files changed, 18 insertions, 19 deletions

diff --git a/xlators/mgmt/glusterd/src/glusterd-mgmt.c b/xlators/mgmt/glusterd/src/glusterd-mgmt.c
index 5b7d782a1e6..a924dd3425b 100644
--- a/xlators/mgmt/glusterd/src/glusterd-mgmt.c
+++ b/xlators/mgmt/glusterd/src/glusterd-mgmt.c
@@ -2180,7 +2180,7 @@ glusterd_mgmt_v3_initiate_all_phases (rpcsvc_request_t *req, glusterd_op_t op,
         /* Save the MY_UUID as the originator_uuid. This originator_uuid
          * will be used by is_origin_glusterd() to determine if a node
          * is the originator node for a command. */
-        originator_uuid = GF_CALLOC (1, sizeof(uuid_t),
+        originator_uuid = GF_MALLOC (sizeof(uuid_t),
                                      gf_common_mt_uuid_t);
         if (!originator_uuid) {
                 ret = -1;
@@ -2416,7 +2416,7 @@ glusterd_mgmt_v3_initiate_snap_phases (rpcsvc_request_t *req, glusterd_op_t op,
         /* Save the MY_UUID as the originator_uuid. This originator_uuid
          * will be used by is_origin_glusterd() to determine if a node
          * is the originator node for a command. */
-        originator_uuid = GF_CALLOC (1, sizeof(uuid_t),
+        originator_uuid = GF_MALLOC (sizeof(uuid_t),
                                      gf_common_mt_uuid_t);
         if (!originator_uuid) {
                 ret = -1;
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
index cd2c364464d..551672c1d74 100644
--- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c
+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
@@ -189,7 +189,7 @@ glusterd_generate_txn_id (dict_t *dict, uuid_t **txn_id)
         GF_ASSERT (priv);
         GF_ASSERT (dict);
 
-        *txn_id = GF_CALLOC (1, sizeof(uuid_t), gf_common_mt_uuid_t);
+        *txn_id = GF_MALLOC (sizeof(uuid_t), gf_common_mt_uuid_t);
         if (!*txn_id)
                 goto out;
 
@@ -1421,8 +1421,7 @@ glusterd_op_stage_set_volume (dict_t *dict, char **op_errstr)
                                 if (!gf_uuid_compare (brickinfo->uuid, MY_UUID)) {
                                         trash_path_len = strlen (value) +
                                                    strlen (brickinfo->path) + 2;
-                                        trash_path = GF_CALLOC (1,
-                                                     trash_path_len,
+                                        trash_path = GF_MALLOC (trash_path_len,
                                                      gf_common_mt_char);
                                         snprintf (trash_path, trash_path_len,
                                                   "%s/%s", brickinfo->path,
@@ -5889,7 +5888,7 @@ glusterd_op_ac_stage_op (glusterd_op_sm_event_t *event, void *ctx)
                         status);
         }
 
-        txn_id = GF_CALLOC (1, sizeof(uuid_t), gf_common_mt_uuid_t);
+        txn_id = GF_MALLOC (sizeof(uuid_t), gf_common_mt_uuid_t);
 
         if (txn_id)
                 gf_uuid_copy (*txn_id, event->txn_id);
@@ -6010,7 +6009,7 @@ glusterd_op_ac_commit_op (glusterd_op_sm_event_t *event, void *ctx)
                         "'Volume %s' failed: %d", gd_op_list[req_ctx->op],
                         status);
 
-        txn_id = GF_CALLOC (1, sizeof(uuid_t), gf_common_mt_uuid_t);
+        txn_id = GF_MALLOC (sizeof(uuid_t), gf_common_mt_uuid_t);
 
         if (txn_id)
                 gf_uuid_copy (*txn_id, event->txn_id);
diff --git a/xlators/mgmt/glusterd/src/glusterd-replace-brick.c b/xlators/mgmt/glusterd/src/glusterd-replace-brick.c
index de8663fdcb4..c3c7d7230d7 100644
--- a/xlators/mgmt/glusterd/src/glusterd-replace-brick.c
+++ b/xlators/mgmt/glusterd/src/glusterd-replace-brick.c
@@ -604,7 +604,7 @@ glusterd_mgmt_v3_initiate_replace_brick_cmd_phases (rpcsvc_request_t *req,
         GF_ASSERT (conf);
 
         txn_generation = conf->generation;
-        originator_uuid = GF_CALLOC (1, sizeof(uuid_t),
+        originator_uuid = GF_MALLOC (sizeof(uuid_t),
                                      gf_common_mt_uuid_t);
         if (!originator_uuid) {
                 ret = -1;
diff --git a/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c b/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c
index fc859c00a9d..be5979cf858 100644
--- a/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c
+++ b/xlators/mgmt/glusterd/src/glusterd-rpc-ops.c
@@ -1829,7 +1829,7 @@ glusterd_mgmt_v3_lock_peers (call_frame_t *frame, xlator_t *this,
                 ret = -1;
                 goto out;
         }
-        frame->cookie = GF_CALLOC (1, sizeof(uuid_t), gf_common_mt_uuid_t);
+        frame->cookie = GF_MALLOC (sizeof(uuid_t), gf_common_mt_uuid_t);
         if (!frame->cookie) {
                 ret = -1;
                 goto out;
@@ -1910,7 +1910,7 @@ glusterd_mgmt_v3_unlock_peers (call_frame_t *frame, xlator_t *this,
                 ret = -1;
                 goto out;
         }
-        frame->cookie = GF_CALLOC (1, sizeof(uuid_t), gf_common_mt_uuid_t);
+        frame->cookie = GF_MALLOC (sizeof(uuid_t), gf_common_mt_uuid_t);
         if (!frame->cookie) {
                 ret = -1;
                 goto out;
@@ -2033,7 +2033,7 @@ glusterd_stage_op (call_frame_t *frame, xlator_t *this,
                 ret = -1;
                 goto out;
         }
-        frame->cookie = GF_CALLOC (1, sizeof(uuid_t), gf_common_mt_uuid_t);
+        frame->cookie = GF_MALLOC (sizeof(uuid_t), gf_common_mt_uuid_t);
         if (!frame->cookie) {
                 ret = -1;
                 goto out;
@@ -2114,7 +2114,7 @@ glusterd_commit_op (call_frame_t *frame, xlator_t *this,
                 ret = -1;
                 goto out;
         }
-        frame->cookie = GF_CALLOC (1, sizeof(uuid_t), gf_common_mt_uuid_t);
+        frame->cookie = GF_MALLOC (sizeof(uuid_t), gf_common_mt_uuid_t);
         if (!frame->cookie) {
                 ret = -1;
                 goto out;
diff --git a/xlators/mgmt/glusterd/src/glusterd-snapshot.c b/xlators/mgmt/glusterd/src/glusterd-snapshot.c
index 1f292ae405c..5d0e15ade02 100644
--- a/xlators/mgmt/glusterd/src/glusterd-snapshot.c
+++ b/xlators/mgmt/glusterd/src/glusterd-snapshot.c
@@ -4160,7 +4160,7 @@ glusterd_handle_snapshot_create (rpcsvc_request_t *req, glusterd_op_t op,
                 goto out;
         }
 
-        uuid_ptr = GF_CALLOC (1, sizeof(uuid_t), gf_common_mt_uuid_t);
+        uuid_ptr = GF_MALLOC (sizeof(uuid_t), gf_common_mt_uuid_t);
         if (!uuid_ptr) {
                 gf_msg (this->name, GF_LOG_ERROR, ENOMEM,
                         GD_MSG_NO_MEMORY, "Out Of Memory");
@@ -4213,7 +4213,7 @@ glusterd_handle_snapshot_create (rpcsvc_request_t *req, glusterd_op_t op,
                         goto out;
                 }
 
-                uuid_ptr = GF_CALLOC (1, sizeof(uuid_t), gf_common_mt_uuid_t);
+                uuid_ptr = GF_MALLOC (sizeof(uuid_t), gf_common_mt_uuid_t);
                 if (!uuid_ptr) {
                         gf_msg (this->name, GF_LOG_ERROR, ENOMEM,
                                 GD_MSG_NO_MEMORY, "Out Of Memory");
@@ -4359,7 +4359,7 @@ glusterd_handle_snapshot_clone (rpcsvc_request_t *req, glusterd_op_t op,
                 goto out;
         }
 
-        uuid_ptr = GF_CALLOC (1, sizeof(uuid_t), gf_common_mt_uuid_t);
+        uuid_ptr = GF_MALLOC (sizeof(uuid_t), gf_common_mt_uuid_t);
         if (!uuid_ptr) {
                 gf_msg (this->name, GF_LOG_ERROR, ENOMEM,
                         GD_MSG_NO_MEMORY, "Out Of Memory");
@@ -4411,7 +4411,7 @@ glusterd_handle_snapshot_clone (rpcsvc_request_t *req, glusterd_op_t op,
                 goto out;
         }
 
-        uuid_ptr = GF_CALLOC (1, sizeof(uuid_t), gf_common_mt_uuid_t);
+        uuid_ptr = GF_MALLOC (sizeof(uuid_t), gf_common_mt_uuid_t);
         if (!uuid_ptr) {
                 gf_msg (this->name, GF_LOG_ERROR, ENOMEM,
                         GD_MSG_NO_MEMORY, "Out Of Memory");
diff --git a/xlators/mgmt/glusterd/src/glusterd-syncop.h b/xlators/mgmt/glusterd/src/glusterd-syncop.h
index 6c5fbf965e6..e5f3aa6304c 100644
--- a/xlators/mgmt/glusterd/src/glusterd-syncop.h
+++ b/xlators/mgmt/glusterd/src/glusterd-syncop.h
@@ -40,7 +40,7 @@
         } while (0)
 
 #define GD_ALLOC_COPY_UUID(dst_ptr, uuid, ret) do {                            \
-        dst_ptr = GF_CALLOC (1, sizeof (*dst_ptr), gf_common_mt_uuid_t);       \
+        dst_ptr = GF_MALLOC (sizeof (*dst_ptr), gf_common_mt_uuid_t);       \
         if (dst_ptr) {                                                         \
                 gf_uuid_copy (*dst_ptr, uuid);                                 \
                 ret = 0;                                                       \
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index 51c81db2f35..612fa35f90b 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -9685,7 +9685,7 @@ glusterd_append_status_dicts (dict_t *dst, dict_t *src)
                 if (ret)
                         goto out;
 
-                dst_sts_val = GF_CALLOC (1, sizeof(gf_gsync_status_t),
+                dst_sts_val = GF_MALLOC (sizeof(gf_gsync_status_t),
                                          gf_common_mt_gsync_status_t);
                 if (!dst_sts_val) {
                         gf_msg ("glusterd", GF_LOG_ERROR, ENOMEM,
@@ -12194,7 +12194,7 @@ glusterd_set_originator_uuid (dict_t *dict)
 
         GF_ASSERT (dict);
 
-        originator_uuid = GF_CALLOC (1, sizeof(uuid_t),
+        originator_uuid = GF_MALLOC (sizeof(uuid_t),
                                      gf_common_mt_uuid_t);
         if (!originator_uuid) {
                 ret = -1;