> On Feb 21, 2017, at 1:35 PM, J. Bruce Fields <bfields@xxxxxxxxxx> wrote:
>
> On Mon, Feb 20, 2017 at 11:38:22PM +0100, Andreas Gruenbacher wrote:
>> On Sun, Feb 19, 2017 at 3:07 AM, J. Bruce Fields <bfields@xxxxxxxxxx> wrote:
>>> @@ -5079,32 +5080,22 @@ static ssize_t nfs4_do_get_acl(struct inode *inode, void *buf, size_t buflen)
>>> .rpc_argp = &args,
>>> .rpc_resp = &res,
>>> };
>>> - unsigned int npages = DIV_ROUND_UP(buflen, PAGE_SIZE) + 1;
>>> - int ret = -ENOMEM, i;
>>> -
>>> - if (npages > ARRAY_SIZE(pages))
>>> - return -ERANGE;
>>> -
>>> - for (i = 0; i < npages; i++) {
>>> - pages[i] = alloc_page(GFP_KERNEL);
>>> - if (!pages[i])
>>> - goto out_free;
>>> - }
>>> + int ret, i;
>>>
>>> /* for decoding across pages */
>>> res.acl_scratch = alloc_page(GFP_KERNEL);
>>> if (!res.acl_scratch)
>>> - goto out_free;
>>> + return -ENOMEM;
>>>
>>> - args.acl_len = npages * PAGE_SIZE;
>>> + args.acl_len = ARRAY_SIZE(pages) << PAGE_SHIFT;
>>
>> Define acl_len directly in the args initializer instead of here.
>
> Got it, thanks. I'll send another revision of the series.
Thanks Bruce,
You can add:
Signed-off-by: Weston Andros Adamson <dros@xxxxxxxxxxxxxxx>
on the next revision.
-dros
>
> --b.
>
>>
>>> - dprintk("%s buf %p buflen %zu npages %d args.acl_len %zu\n",
>>> - __func__, buf, buflen, npages, args.acl_len);
>>> + dprintk("%s buf %p buflen %zu args.acl_len %zu\n",
>>> + __func__, buf, buflen, args.acl_len);
>>> ret = nfs4_call_sync(NFS_SERVER(inode)->client, NFS_SERVER(inode),
>>> &msg, &args.seq_args, &res.seq_res, 0);
>>> if (ret == 0)
>>> ret = res.acl_len;
>>> -out_free:
>>> +
>>> for (i = 0; i < ARRAY_SIZE(pages) && pages[i]; i++)
>>> __free_page(pages[i]);
>>> __free_page(res.acl_scratch);
>>> --
>>> 2.9.3
>>>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
