|
@@ -501,16 +501,6 @@ struct nfs_pgio_header *nfs_pgio_header_alloc(const struct nfs_rw_ops *ops)
|
|
|
}
|
|
|
EXPORT_SYMBOL_GPL(nfs_pgio_header_alloc);
|
|
|
|
|
|
-/*
|
|
|
- * nfs_pgio_header_free - Free a read or write header
|
|
|
- * @hdr: The header to free
|
|
|
- */
|
|
|
-void nfs_pgio_header_free(struct nfs_pgio_header *hdr)
|
|
|
-{
|
|
|
- hdr->rw_ops->rw_free_header(hdr);
|
|
|
-}
|
|
|
-EXPORT_SYMBOL_GPL(nfs_pgio_header_free);
|
|
|
-
|
|
|
/**
|
|
|
* nfs_pgio_data_destroy - make @hdr suitable for reuse
|
|
|
*
|
|
@@ -519,14 +509,24 @@ EXPORT_SYMBOL_GPL(nfs_pgio_header_free);
|
|
|
*
|
|
|
* @hdr: A header that has had nfs_generic_pgio called
|
|
|
*/
|
|
|
-void nfs_pgio_data_destroy(struct nfs_pgio_header *hdr)
|
|
|
+static void nfs_pgio_data_destroy(struct nfs_pgio_header *hdr)
|
|
|
{
|
|
|
if (hdr->args.context)
|
|
|
put_nfs_open_context(hdr->args.context);
|
|
|
if (hdr->page_array.pagevec != hdr->page_array.page_array)
|
|
|
kfree(hdr->page_array.pagevec);
|
|
|
}
|
|
|
-EXPORT_SYMBOL_GPL(nfs_pgio_data_destroy);
|
|
|
+
|
|
|
+/*
|
|
|
+ * nfs_pgio_header_free - Free a read or write header
|
|
|
+ * @hdr: The header to free
|
|
|
+ */
|
|
|
+void nfs_pgio_header_free(struct nfs_pgio_header *hdr)
|
|
|
+{
|
|
|
+ nfs_pgio_data_destroy(hdr);
|
|
|
+ hdr->rw_ops->rw_free_header(hdr);
|
|
|
+}
|
|
|
+EXPORT_SYMBOL_GPL(nfs_pgio_header_free);
|
|
|
|
|
|
/**
|
|
|
* nfs_pgio_rpcsetup - Set up arguments for a pageio call
|
|
@@ -640,7 +640,6 @@ EXPORT_SYMBOL_GPL(nfs_initiate_pgio);
|
|
|
static void nfs_pgio_error(struct nfs_pgio_header *hdr)
|
|
|
{
|
|
|
set_bit(NFS_IOHDR_REDO, &hdr->flags);
|
|
|
- nfs_pgio_data_destroy(hdr);
|
|
|
hdr->completion_ops->completion(hdr);
|
|
|
}
|
|
|
|
|
@@ -651,7 +650,6 @@ static void nfs_pgio_error(struct nfs_pgio_header *hdr)
|
|
|
static void nfs_pgio_release(void *calldata)
|
|
|
{
|
|
|
struct nfs_pgio_header *hdr = calldata;
|
|
|
- nfs_pgio_data_destroy(hdr);
|
|
|
hdr->completion_ops->completion(hdr);
|
|
|
}
|
|
|
|