SUNRPC: Update gssx_accept_sec_context() to use xdr_set_scratch_folio()

This was the last caller of xdr_set_scratch_page(), so I remove this
function while I'm at it.

Signed-off-by: Anna Schumaker <anna.schumaker@oracle.com>

diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h
index 3ce17321689a247d60dcfb80e482c3a43a7c70f2..49278749ad0c1b806c8e078f57636b2afa6043f4 100644 (file)
--- a/include/linux/sunrpc/xdr.h
+++ b/include/linux/sunrpc/xdr.h
@@ -287,19 +287,6 @@ xdr_set_scratch_buffer(struct xdr_stream *xdr, void *buf, size_t buflen)
        xdr->scratch.iov_len = buflen;
 }
 
-/**
- * xdr_set_scratch_page - Attach a scratch buffer for decoding data
- * @xdr: pointer to xdr_stream struct
- * @page: an anonymous page
- *
- * See xdr_set_scratch_buffer().
- */
-static inline void
-xdr_set_scratch_page(struct xdr_stream *xdr, struct page *page)
-{
-       xdr_set_scratch_buffer(xdr, page_address(page), PAGE_SIZE);
-}
-
 /**
  * xdr_set_scratch_folio - Attach a scratch buffer for decoding data
  * @xdr: pointer to xdr_stream struct

diff --git a/net/sunrpc/auth_gss/gss_rpc_xdr.c b/net/sunrpc/auth_gss/gss_rpc_xdr.c
index cb32ab9a839521f2dffdffd363bb763983e1c6c4..7d2cdc2bd374e28bb581306fe682a40ebf415256 100644 (file)
--- a/net/sunrpc/auth_gss/gss_rpc_xdr.c
+++ b/net/sunrpc/auth_gss/gss_rpc_xdr.c
@@ -794,12 +794,12 @@ int gssx_dec_accept_sec_context(struct rpc_rqst *rqstp,
        struct gssx_res_accept_sec_context *res = data;
        u32 value_follows;
        int err;
-       struct page *scratch;
+       struct folio *scratch;
 
-       scratch = alloc_page(GFP_KERNEL);
+       scratch = folio_alloc(GFP_KERNEL, 0);
        if (!scratch)
                return -ENOMEM;
-       xdr_set_scratch_page(xdr, scratch);
+       xdr_set_scratch_folio(xdr, scratch);
 
        /* res->status */
        err = gssx_dec_status(xdr, &res->status);
@@ -844,6 +844,6 @@ int gssx_dec_accept_sec_context(struct rpc_rqst *rqstp,
        err = gssx_dec_option_array(xdr, &res->options);
 
 out_free:
-       __free_page(scratch);
+       folio_put(scratch);
        return err;
 }