[NET]: kfree cleanup

From: Jesper Juhl <jesper.juhl@gmail.com>

This is the net/ part of the big kfree cleanup patch.

Remove pointless checks for NULL prior to calling kfree() in net/.

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Arnaldo Carvalho de Melo <acme@conectiva.com.br>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Acked-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>

8 files changed, 11 insertions, 20 deletions

diff --git a/net/sunrpc/auth_gss/gss_krb5_seal.c b/net/sunrpc/auth_gss/gss_krb5_seal.c
index 13f8ae979454..d0dfdfd5e79e 100644
--- a/net/sunrpc/auth_gss/gss_krb5_seal.c
+++ b/net/sunrpc/auth_gss/gss_krb5_seal.c
@@ -143,6 +143,6 @@ gss_get_mic_kerberos(struct gss_ctx *gss_ctx, struct xdr_buf *text,
 
         return ((ctx->endtime < now) ? GSS_S_CONTEXT_EXPIRED : GSS_S_COMPLETE);
 out_err:
-        if (md5cksum.data) kfree(md5cksum.data);
+        kfree(md5cksum.data);
         return GSS_S_FAILURE;
 }
diff --git a/net/sunrpc/auth_gss/gss_krb5_unseal.c b/net/sunrpc/auth_gss/gss_krb5_unseal.c
index 2030475d98ed..db055fd7d778 100644
--- a/net/sunrpc/auth_gss/gss_krb5_unseal.c
+++ b/net/sunrpc/auth_gss/gss_krb5_unseal.c
@@ -176,6 +176,6 @@ gss_verify_mic_kerberos(struct gss_ctx *gss_ctx,
 
         ret = GSS_S_COMPLETE;
 out:
-        if (md5cksum.data) kfree(md5cksum.data);
+        kfree(md5cksum.data);
         return ret;
 }
diff --git a/net/sunrpc/auth_gss/gss_mech_switch.c b/net/sunrpc/auth_gss/gss_mech_switch.c
index b048bf672da2..f8bac6ccd524 100644
--- a/net/sunrpc/auth_gss/gss_mech_switch.c
+++ b/net/sunrpc/auth_gss/gss_mech_switch.c
@@ -60,8 +60,7 @@ gss_mech_free(struct gss_api_mech *gm)
 
         for (i = 0; i < gm->gm_pf_num; i++) {
                 pf = &gm->gm_pfs[i];
-                if (pf->auth_domain_name)
-                        kfree(pf->auth_domain_name);
+                kfree(pf->auth_domain_name);
                 pf->auth_domain_name = NULL;
         }
 }
diff --git a/net/sunrpc/auth_gss/gss_spkm3_seal.c b/net/sunrpc/auth_gss/gss_spkm3_seal.c
index 148201e929d0..d1e12b25d6e2 100644
--- a/net/sunrpc/auth_gss/gss_spkm3_seal.c
+++ b/net/sunrpc/auth_gss/gss_spkm3_seal.c
@@ -122,8 +122,7 @@ spkm3_make_token(struct spkm3_ctx *ctx,
 
         return  GSS_S_COMPLETE;
 out_err:
-        if (md5cksum.data) 
-                kfree(md5cksum.data);
+        kfree(md5cksum.data);
         token->data = NULL;
         token->len = 0;
         return GSS_S_FAILURE;
diff --git a/net/sunrpc/auth_gss/gss_spkm3_token.c b/net/sunrpc/auth_gss/gss_spkm3_token.c
index 46c08a0710f6..1f824578d773 100644
--- a/net/sunrpc/auth_gss/gss_spkm3_token.c
+++ b/net/sunrpc/auth_gss/gss_spkm3_token.c
@@ -259,8 +259,7 @@ spkm3_verify_mic_token(unsigned char **tokp, int *mic_hdrlen, unsigned char **ck
 
         ret = GSS_S_COMPLETE;
 out:
-        if (spkm3_ctx_id.data)
-                kfree(spkm3_ctx_id.data);
+        kfree(spkm3_ctx_id.data);
         return ret;
 }
 
diff --git a/net/sunrpc/auth_gss/gss_spkm3_unseal.c b/net/sunrpc/auth_gss/gss_spkm3_unseal.c
index c3c0d9586103..241d5b30dfcb 100644
--- a/net/sunrpc/auth_gss/gss_spkm3_unseal.c
+++ b/net/sunrpc/auth_gss/gss_spkm3_unseal.c
@@ -120,9 +120,7 @@ spkm3_read_token(struct spkm3_ctx *ctx,
         /* XXX: need to add expiration and sequencing */
         ret = GSS_S_COMPLETE;
 out:
-        if (md5cksum.data) 
-                kfree(md5cksum.data);
-        if (wire_cksum.data) 
-                kfree(wire_cksum.data);
+        kfree(md5cksum.data);
+        kfree(wire_cksum.data);
         return ret;
 }
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index 5a220b2bb376..e4296c8b861e 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -196,12 +196,9 @@ svc_exit_thread(struct svc_rqst *rqstp)
         struct svc_serv *serv = rqstp->rq_server;
 
         svc_release_buffer(rqstp);
-        if (rqstp->rq_resp)
-                kfree(rqstp->rq_resp);
-        if (rqstp->rq_argp)
-                kfree(rqstp->rq_argp);
-        if (rqstp->rq_auth_data)
-                kfree(rqstp->rq_auth_data);
+        kfree(rqstp->rq_resp);
+        kfree(rqstp->rq_argp);
+        kfree(rqstp->rq_auth_data);
         kfree(rqstp);
 
         /* Release the server */
diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
index 32df43372ee9..aaf08cdd19f0 100644
--- a/net/sunrpc/xdr.c
+++ b/net/sunrpc/xdr.c
@@ -992,8 +992,7 @@ xdr_xcode_array2(struct xdr_buf *buf, unsigned int base,
         err = 0;
 
 out:
-        if (elem)
-                kfree(elem);
+        kfree(elem);
         if (ppages)
                 kunmap(*ppages);
         return err;