Commit 2f8416f2 authored by Anna Schumaker's avatar Anna Schumaker
Browse files

NFS: Update getacl to use xdr_set_scratch_folio() 



Signed-off-by: default avatarAnna Schumaker <anna.schumaker@oracle.com>
parent 670335c0

fs/nfs/nfs4proc.c

+2 −2
Original line number Diff line number Diff line
@@ -6160,7 +6160,7 @@ static ssize_t __nfs4_get_acl_uncached(struct inode *inode, void *buf, 
	}



	/* for decoding across pages */

	res.acl_scratch = alloc_page(GFP_KERNEL);

	res.acl_scratch = folio_alloc(GFP_KERNEL, 0);

	if (!res.acl_scratch)

		goto out_free;
@@ -6196,7 +6196,7 @@ static ssize_t __nfs4_get_acl_uncached(struct inode *inode, void *buf, 
	while (--i >= 0)

		__free_page(pages[i]);

	if (res.acl_scratch)

		__free_page(res.acl_scratch);

		folio_put(res.acl_scratch);

	kfree(pages);

	return ret;

}

fs/nfs/nfs4xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -6585,7 +6585,7 @@ nfs4_xdr_dec_getacl(struct rpc_rqst *rqstp, struct xdr_stream *xdr, 
	int status;



	if (res->acl_scratch != NULL)

		xdr_set_scratch_page(xdr, res->acl_scratch);

		xdr_set_scratch_folio(xdr, res->acl_scratch);

	status = decode_compound_hdr(xdr, &hdr);

	if (status)

		goto out;

include/linux/nfs_xdr.h

+1 −1
Original line number Diff line number Diff line
@@ -862,7 +862,7 @@ struct nfs_getaclres { 
	size_t				acl_len;

	size_t				acl_data_offset;

	int				acl_flags;

	struct page *			acl_scratch;

	struct folio *			acl_scratch;

};



struct nfs_setattrres {