On Fri, 2011-03-04 at 16:09 -0500, Neil Horman wrote:
> +static int buf_to_pages_noslab(const void *buf, size_t buflen,
> + struct page **pages, unsigned int *pgbase)
> +{
> + struct page *newpage, **spages;
> + int rc = 0;
> + size_t len;
> + spages = pages;
> +
> + do {
> + len = min(PAGE_CACHE_SIZE, buflen);
> + newpage = alloc_page(GFP_KERNEL);
> +
> + if (newpage == NULL)
> + goto unwind;
> + memcpy(page_address(newpage), buf, len);
> + buf += len;
> + buflen -= len;
> + *(pages++) = newpage;
Nit: the brackets aren't needed here.
> + rc++;
> + } while (buflen != 0);
> +
> + *pgbase = 0;
> + return rc;
> +
> +unwind:
> + for(; rc > 0; rc--)
> + __free_page(spages[rc-1]);
> + return -ENOMEM;
> +}
> +
> struct nfs4_cached_acl {
> int cached;
> size_t len;
> @@ -3420,13 +3451,23 @@ static int __nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t bufl
> .rpc_argp = &arg,
> .rpc_resp = &res,
> };
> - int ret;
> + int ret, i;
>
> if (!nfs4_server_supports_acls(server))
> return -EOPNOTSUPP;
> + i = buf_to_pages_noslab(buf, buflen, arg.acl_pages, &arg.acl_pgbase);
NIT: arg.acl_pgbase is already initialised to 0.
> + if (i < 0)
> + return i;
> nfs_inode_return_delegation(inode);
> - buf_to_pages(buf, buflen, arg.acl_pages, &arg.acl_pgbase);
> ret = nfs4_call_sync(server, &msg, &arg, &res, 1);
> +
> + /*
> + * Free each page after tx, so the only ref left is
> + * held by the network stack
> + */
> + for (; i > 0; i--)
> + put_page(pages[i-1]);
> +
> /*
> * Acl update can result in inode attribute update.
> * so mark the attribute cache invalid.
--
Trond Myklebust
Linux NFS client maintainer
NetApp
Trond.Myklebust@xxxxxxxxxx
www.netapp.com
--
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
