SUNRPC: Remove xdr_buf_read_mic()

Clean up: this function is no longer used.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-by: Benjamin Coddington <bcodding@redhat.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h
index b41f3497799551ab4a5902b7791f38fdc63123fb..8a6dd5bd67486fd0910a356bb85337d0d16e0495 100644 (file)
--- a/include/linux/sunrpc/xdr.h
+++ b/include/linux/sunrpc/xdr.h
@@ -184,7 +184,6 @@ xdr_adjust_iovec(struct kvec *iov, __be32 *p)
 extern void xdr_shift_buf(struct xdr_buf *, size_t);
 extern void xdr_buf_from_iov(struct kvec *, struct xdr_buf *);
 extern int xdr_buf_subsegment(struct xdr_buf *, struct xdr_buf *, unsigned int, unsigned int);
-extern int xdr_buf_read_mic(struct xdr_buf *, struct xdr_netobj *, unsigned int);
 extern int read_bytes_from_xdr_buf(struct xdr_buf *, unsigned int, void *, unsigned int);
 extern int write_bytes_to_xdr_buf(struct xdr_buf *, unsigned int, void *, unsigned int);
 

diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
index e5497dc2475b839375666633a3fd756f114e6081..15b58c5144f9eeaccb34a0525eaedac41f520f37 100644 (file)
--- a/net/sunrpc/xdr.c
+++ b/net/sunrpc/xdr.c
@@ -1235,61 +1235,6 @@ xdr_encode_word(struct xdr_buf *buf, unsigned int base, u32 obj)
 }
 EXPORT_SYMBOL_GPL(xdr_encode_word);
 
-/**
- * xdr_buf_read_mic() - obtain the address of the GSS mic from xdr buf
- * @buf: pointer to buffer containing a mic
- * @mic: on success, returns the address of the mic
- * @offset: the offset in buf where mic may be found
- *
- * This function may modify the xdr buf if the mic is found to be straddling
- * a boundary between head, pages, and tail.  On success the mic can be read
- * from the address returned.  There is no need to free the mic.
- *
- * Return: Success returns 0, otherwise an integer error.
- */
-int xdr_buf_read_mic(struct xdr_buf *buf, struct xdr_netobj *mic, unsigned int offset)
-{
-       struct xdr_buf subbuf;
-       unsigned int boundary;
-
-       if (xdr_decode_word(buf, offset, &mic->len))
-               return -EFAULT;
-       offset += 4;
-
-       /* Is the mic partially in the head? */
-       boundary = buf->head[0].iov_len;
-       if (offset < boundary && (offset + mic->len) > boundary)
-               xdr_shift_buf(buf, boundary - offset);
-
-       /* Is the mic partially in the pages? */
-       boundary += buf->page_len;
-       if (offset < boundary && (offset + mic->len) > boundary)
-               xdr_shrink_pagelen(buf, boundary - offset);
-
-       if (xdr_buf_subsegment(buf, &subbuf, offset, mic->len))
-               return -EFAULT;
-
-       /* Is the mic contained entirely in the head? */
-       mic->data = subbuf.head[0].iov_base;
-       if (subbuf.head[0].iov_len == mic->len)
-               return 0;
-       /* ..or is the mic contained entirely in the tail? */
-       mic->data = subbuf.tail[0].iov_base;
-       if (subbuf.tail[0].iov_len == mic->len)
-               return 0;
-
-       /* Find a contiguous area in @buf to hold all of @mic */
-       if (mic->len > buf->buflen - buf->len)
-               return -ENOMEM;
-       if (buf->tail[0].iov_len != 0)
-               mic->data = buf->tail[0].iov_base + buf->tail[0].iov_len;
-       else
-               mic->data = buf->head[0].iov_base + buf->head[0].iov_len;
-       __read_bytes_from_xdr_buf(&subbuf, mic->data, mic->len);
-       return 0;
-}
-EXPORT_SYMBOL_GPL(xdr_buf_read_mic);
-
 /* Returns 0 on success, or else a negative error code. */
 static int
 xdr_xcode_array2(struct xdr_buf *buf, unsigned int base,