5 files changed, 13 insertions, 26 deletions

diff --git a/xlators/features/locks/src/clear.c b/xlators/features/locks/src/clear.c
index 5533c6bdcb9..015a9fe723e 100644
--- a/xlators/features/locks/src/clear.c
+++ b/xlators/features/locks/src/clear.c
@@ -149,8 +149,7 @@ clrlk_parse_args (const char* cmd, clrlk_args *args)
 
         ret = 0;
 out:
-        if (free_ptr)
-                GF_FREE (free_ptr);
+        GF_FREE (free_ptr);
         return ret;
 }
 
diff --git a/xlators/features/locks/src/common.c b/xlators/features/locks/src/common.c
index f59d0882c1a..542043fe121 100644
--- a/xlators/features/locks/src/common.c
+++ b/xlators/features/locks/src/common.c
@@ -182,8 +182,7 @@ pl_print_lockee (char *str, int size, fd_t *fd, loc_t *loc)
                   uuid_utoa (inode->gfid), fd,
                   ipath ? ipath : "<nul>");
 
-        if (ipath)
-                GF_FREE (ipath);
+        GF_FREE (ipath);
 }
 
 
diff --git a/xlators/features/locks/src/entrylk.c b/xlators/features/locks/src/entrylk.c
index 2a47657dbbb..2c4904ff3d7 100644
--- a/xlators/features/locks/src/entrylk.c
+++ b/xlators/features/locks/src/entrylk.c
@@ -341,8 +341,7 @@ __lock_name (pl_inode_t *pinode, const char *basename, entrylk_type type,
         if (conf) {
                 ret = -EAGAIN;
                 if (nonblock){
-                        if (lock->basename)
-                                GF_FREE ((char *)lock->basename);
+                        GF_FREE ((char *)lock->basename);
                         GF_FREE (lock);
                         goto out;
 
@@ -361,8 +360,7 @@ __lock_name (pl_inode_t *pinode, const char *basename, entrylk_type type,
         if ( __blocked_lock_conflict (dom, basename, type) && !(__owner_has_lock (dom, lock))) {
                 ret = -EAGAIN;
                 if (nonblock) {
-                        if (lock->basename)
-                                GF_FREE ((char *) lock->basename);
+                        GF_FREE ((char *) lock->basename);
                         GF_FREE (lock);
                         goto out;
 
@@ -499,8 +497,7 @@ __grant_blocked_entry_locks (xlator_t *this, pl_inode_t *pl_inode,
                 } else {
                         gf_log (this->name, GF_LOG_DEBUG,
                                 "should never happen");
-                        if (bl->basename)
-                                GF_FREE ((char *)bl->basename);
+                        GF_FREE ((char *)bl->basename);
                         GF_FREE (bl);
                 }
         }
@@ -601,8 +598,7 @@ release_entry_locks_for_transport (xlator_t *this, pl_inode_t *pinode,
 
                 STACK_UNWIND_STRICT (entrylk, lock->frame, -1, EAGAIN, NULL);
 
-                if (lock->basename)
-                        GF_FREE ((char *)lock->basename);
+                GF_FREE ((char *)lock->basename);
                 GF_FREE (lock);
 
         }
@@ -612,8 +608,7 @@ release_entry_locks_for_transport (xlator_t *this, pl_inode_t *pinode,
 
                 STACK_UNWIND_STRICT (entrylk, lock->frame, 0, 0, NULL);
 
-                if (lock->basename)
-                        GF_FREE ((char *)lock->basename);
+                GF_FREE ((char *)lock->basename);
                 GF_FREE (lock);
         }
 
diff --git a/xlators/features/locks/src/inodelk.c b/xlators/features/locks/src/inodelk.c
index a2e65d55fc3..eba85795c20 100644
--- a/xlators/features/locks/src/inodelk.c
+++ b/xlators/features/locks/src/inodelk.c
@@ -454,8 +454,7 @@ release_inode_locks_of_transport (xlator_t *this, pl_dom_list_t *dom,
                         __pl_inodelk_unref (l);
                 }
         }
-        if (path)
-                GF_FREE (path);
+        GF_FREE (path);
 
         pthread_mutex_unlock (&pinode->mutex);
 
diff --git a/xlators/features/locks/src/posix.c b/xlators/features/locks/src/posix.c
index 3da40ffacac..09ce6377466 100644
--- a/xlators/features/locks/src/posix.c
+++ b/xlators/features/locks/src/posix.c
@@ -476,8 +476,7 @@ pl_getxattr (call_frame_t *frame, xlator_t *this, loc_t *loc,
 out:
         STACK_UNWIND_STRICT (getxattr, frame, op_ret, op_errno, dict, xdata);
 
-        if (args.opts)
-                GF_FREE (args.opts);
+        GF_FREE (args.opts);
         if (op_ret && lk_summary)
                 GF_FREE (lk_summary);
         if (dict)
@@ -1351,8 +1350,7 @@ pl_forget (xlator_t *this,
                                 list_for_each_entry_safe (entry_l, entry_tmp, &dom->entrylk_list, domain_list) {
                                         list_del_init (&entry_l->domain_list);
 
-                                        if (entry_l->basename)
-                                                GF_FREE ((char *)entry_l->basename);
+                                        GF_FREE ((char *)entry_l->basename);
                                         GF_FREE (entry_l);
                                 }
 
@@ -1385,8 +1383,7 @@ pl_forget (xlator_t *this,
         list_for_each_entry_safe (entry_l, entry_tmp, &entrylks_released, blocked_locks) {
 
                 STACK_UNWIND_STRICT (entrylk, entry_l->frame, -1, 0, NULL);
-                if (entry_l->basename)
-                        GF_FREE ((char *)entry_l->basename);
+                GF_FREE ((char *)entry_l->basename);
                 GF_FREE (entry_l);
 
         }
@@ -2033,8 +2030,7 @@ pl_dump_inode_priv (xlator_t *this, inode_t *inode)
         }
 
 out:
-        if (pathname)
-                GF_FREE (pathname);
+        GF_FREE (pathname);
 
         return ret;
 }
@@ -2120,8 +2116,7 @@ init (xlator_t *this)
 
 out:
         if (ret) {
-                if (priv)
-                        GF_FREE (priv);
+                GF_FREE (priv);
         }
         return ret;
 }