tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

NFS: Update getacl to use xdr_set_scratch_folio()

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

Anna Schumaker 2f8416f2 670335c0

+4 -4
+2 -2
fs/nfs/nfs4proc.c
··· 6160 6160 } 6161 6161 6162 6162 /* for decoding across pages */ 6163 - res.acl_scratch = alloc_page(GFP_KERNEL); 6163 + res.acl_scratch = folio_alloc(GFP_KERNEL, 0); 6164 6164 if (!res.acl_scratch) 6165 6165 goto out_free; 6166 6166 ··· 6196 6196 while (--i >= 0) 6197 6197 __free_page(pages[i]); 6198 6198 if (res.acl_scratch) 6199 - __free_page(res.acl_scratch); 6199 + folio_put(res.acl_scratch); 6200 6200 kfree(pages); 6201 6201 return ret; 6202 6202 }
+1 -1
fs/nfs/nfs4xdr.c
··· 6585 6585 int status; 6586 6586 6587 6587 if (res->acl_scratch != NULL) 6588 - xdr_set_scratch_page(xdr, res->acl_scratch); 6588 + xdr_set_scratch_folio(xdr, res->acl_scratch); 6589 6589 status = decode_compound_hdr(xdr, &hdr); 6590 6590 if (status) 6591 6591 goto out;
+1 -1
include/linux/nfs_xdr.h
··· 862 862 size_t acl_len; 863 863 size_t acl_data_offset; 864 864 int acl_flags; 865 - struct page * acl_scratch; 865 + struct folio * acl_scratch; 866 866 }; 867 867 868 868 struct nfs_setattrres {