SUNRPC: Remove the deprecated function lookup_hash() from rpc_pipefs code

[linux-2.6-omap-h63xx.git] / net / sunrpc / xdr.c

diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
index 32df43372ee97cc277ed54d058f77667c8985160..ca4bfa57e1167c759a5fa00bed2ff4732e8c5b38 100644 (file)
--- a/net/sunrpc/xdr.c
+++ b/net/sunrpc/xdr.c
@@ -92,27 +92,6 @@ xdr_encode_string(u32 *p, const char *string)
        return xdr_encode_array(p, string, strlen(string));
 }
 
-u32 *
-xdr_decode_string(u32 *p, char **sp, int *lenp, int maxlen)
-{
-       unsigned int    len;
-       char            *string;
-
-       if ((len = ntohl(*p++)) > maxlen)
-               return NULL;
-       if (lenp)
-               *lenp = len;
-       if ((len % 4) != 0) {
-               string = (char *) p;
-       } else {
-               string = (char *) (p - 1);
-               memmove(string, p, len);
-       }
-       string[len] = '\0';
-       *sp = string;
-       return p + XDR_QUADLEN(len);
-}
-
 u32 *
 xdr_decode_string_inplace(u32 *p, char **sp, int *lenp, int maxlen)
 {
@@ -992,8 +971,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;