From 7820b2c1f88b207a8b1270b8c3cb3b797b7563d2 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Fri, 13 Jul 2012 10:29:48 +0200
Subject: remove useless if-before-free (and free-like) functions

See comments in http://bugzilla.redhat.com/839925 for
the code to perform this change.

Signed-off-by: Jim Meyering <meyering@redhat.com>
BUG: 839925
Change-Id: I10e4ecff16c3749fe17c2831c516737e08a3205a
Reviewed-on: http://review.gluster.com/3661
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
---
 xlators/nfs/server/src/mount3.c        | 3 +--
 xlators/nfs/server/src/mount3udp_svc.c | 9 +++------
 xlators/nfs/server/src/nfs-common.c    | 6 ++----
 xlators/nfs/server/src/nfs3.c          | 6 ++----
 xlators/nfs/server/src/nlm4.c          | 3 +--
 5 files changed, 9 insertions(+), 18 deletions(-)

(limited to 'xlators/nfs')

diff --git a/xlators/nfs/server/src/mount3.c b/xlators/nfs/server/src/mount3.c
index e85f82ad5..aafabf4ae 100644
--- a/xlators/nfs/server/src/mount3.c
+++ b/xlators/nfs/server/src/mount3.c
@@ -1584,8 +1584,7 @@ __mnt3_init_volume_direxports (struct mount3_state *ms, xlator_t *xlator,
 
         ret = 0;
 err:
-        if (dupopt)
-                GF_FREE (dupopt);
+        GF_FREE (dupopt);
 
         return ret;
 }
diff --git a/xlators/nfs/server/src/mount3udp_svc.c b/xlators/nfs/server/src/mount3udp_svc.c
index 2c370a74a..aa38b1cc4 100644
--- a/xlators/nfs/server/src/mount3udp_svc.c
+++ b/xlators/nfs/server/src/mount3udp_svc.c
@@ -78,12 +78,9 @@ mountudpproc3_mnt_3_svc(dirpath **dpp, struct svc_req *req)
         return res;
 
  err:
-        if (fh)
-                GF_FREE (fh);
-        if (res)
-                GF_FREE (res);
-        if (autharr)
-                GF_FREE (autharr);
+        GF_FREE (fh);
+        GF_FREE (res);
+        GF_FREE (autharr);
         return NULL;
 }
 
diff --git a/xlators/nfs/server/src/nfs-common.c b/xlators/nfs/server/src/nfs-common.c
index 21093d711..d35df87bc 100644
--- a/xlators/nfs/server/src/nfs-common.c
+++ b/xlators/nfs/server/src/nfs-common.c
@@ -235,8 +235,7 @@ err:
         if (parent)
                 inode_unref (parent);
 
-        if (resolvedpath)
-                GF_FREE (resolvedpath);
+        GF_FREE (resolvedpath);
 
         return ret;
 }
@@ -397,8 +396,7 @@ err:
         if (entryinode)
                 inode_unref (entryinode);
 
-        if (resolvedpath)
-                GF_FREE (resolvedpath);
+        GF_FREE (resolvedpath);
 
         return ret;
 }
diff --git a/xlators/nfs/server/src/nfs3.c b/xlators/nfs/server/src/nfs3.c
index 684123958..9b8af7df8 100644
--- a/xlators/nfs/server/src/nfs3.c
+++ b/xlators/nfs/server/src/nfs3.c
@@ -448,11 +448,9 @@ nfs3_call_state_wipe (nfs3_call_state_t *cs)
                 fd_unref (cs->fd);
         }
 
-        if (cs->resolventry)
-                GF_FREE (cs->resolventry);
+        GF_FREE (cs->resolventry);
 
-        if (cs->pathname)
-                GF_FREE (cs->pathname);
+        GF_FREE (cs->pathname);
 
         if (!list_empty (&cs->entries.list))
                 gf_dirent_free (&cs->entries);
diff --git a/xlators/nfs/server/src/nlm4.c b/xlators/nfs/server/src/nlm4.c
index 9a0cd020a..6399cb043 100644
--- a/xlators/nfs/server/src/nlm4.c
+++ b/xlators/nfs/server/src/nlm4.c
@@ -1916,8 +1916,7 @@ nlm4_create_share_reservation (nfs3_call_state_t *cs)
  out:
         if (ret && inode) {
                 inode_unref (inode);
-                if (share)
-                        GF_FREE (share);
+                GF_FREE (share);
         }
 
         UNLOCK (&nlm_client_list_lk);
-- 
cgit