Multiple posix related files: several modifications

Just looked at posix.c and related code and performed
some changes and cleanups. The only important one is #3 below,
but surely the others (#2 and #4) need careful review.
Changes to other files are as they were related to code paths
in posix.c.

I'll send a separate patch for other posix related files.

Main changes:
1. Proper initializtion for parameters, where it made sense.
2. Logged outside the lock in several places.
3. Moved from CALLOC to MALLOC where it made sense.
4. Aligned structures.
5. moved dictionary functions to use _sizen where possible.
(dict_get() -> dict_get_sizen() for example)

Compile-tested only!

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

1 files changed, 5 insertions, 12 deletions

diff --git a/xlators/features/locks/src/common.c b/xlators/features/locks/src/common.c
index 57599eedb88..43b8790f387 100644
--- a/xlators/features/locks/src/common.c
+++ b/xlators/features/locks/src/common.c
@@ -213,13 +213,11 @@ void
 pl_trace_in(xlator_t *this, call_frame_t *frame, fd_t *fd, loc_t *loc, int cmd,
             struct gf_flock *flock, const char *domain)
 {
-    posix_locks_private_t *priv = NULL;
+    posix_locks_private_t *priv = this->private;
     char pl_locker[256];
     char pl_lockee[256];
     char pl_lock[256];
 
-    priv = this->private;
-
     if (!priv->trace)
         return;
 
@@ -291,13 +289,11 @@ pl_trace_block(xlator_t *this, call_frame_t *frame, fd_t *fd, loc_t *loc,
                int cmd, struct gf_flock *flock, const char *domain)
 
 {
-    posix_locks_private_t *priv = NULL;
+    posix_locks_private_t *priv = this->private;
     char pl_locker[256];
     char pl_lockee[256];
     char pl_lock[256];
 
-    priv = this->private;
-
     if (!priv->trace)
         return;
 
@@ -1002,7 +998,7 @@ pl_setlk(xlator_t *this, pl_inode_t *pl_inode, posix_lock_t *lock,
 
         if (__is_lock_grantable(pl_inode, lock)) {
             if (pl_metalock_is_active(pl_inode)) {
-                __pl_queue_lock(pl_inode, lock, can_block);
+                __pl_queue_lock(pl_inode, lock);
                 pthread_mutex_unlock(&pl_inode->mutex);
                 ret = -2;
                 goto out;
@@ -1015,7 +1011,7 @@ pl_setlk(xlator_t *this, pl_inode_t *pl_inode, posix_lock_t *lock,
             __insert_and_merge(pl_inode, lock);
         } else if (can_block) {
             if (pl_metalock_is_active(pl_inode)) {
-                __pl_queue_lock(pl_inode, lock, can_block);
+                __pl_queue_lock(pl_inode, lock);
                 pthread_mutex_unlock(&pl_inode->mutex);
                 ret = -2;
                 goto out;
@@ -1052,10 +1048,7 @@ out:
 posix_lock_t *
 pl_getlk(pl_inode_t *pl_inode, posix_lock_t *lock)
 {
-    posix_lock_t *conf = NULL;
-
-    conf = first_conflicting_overlap(pl_inode, lock);
-
+    posix_lock_t *conf = first_conflicting_overlap(pl_inode, lock);
     if (conf == NULL) {
         lock->fl_type = F_UNLCK;
         return lock;