UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

NFS: Remove unused argument from nfs_create_request() 

All the callers of nfs_create_request() are now creating page group
heads, so we can remove the redundant 'last' page argument.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
This commit is contained in:
Trond Myklebust 2019-04-07 13:59:07 -04:00 committed by Anna Schumaker
parent c917cfaf9b
commit 28b1d3f5a7
5 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/nfs/direct.c
View File

@ -492,7 +492,7 @@ static ssize_t nfs_direct_read_schedule_iovec(struct nfs_direct_req *dreq,
struct nfs_page *req; struct nfs_page *req;
unsigned int req_len = min_t(size_t, bytes, PAGE_SIZE - pgbase); unsigned int req_len = min_t(size_t, bytes, PAGE_SIZE - pgbase);
/* XXX do we need to do the eof zeroing found in async_filler? */ /* XXX do we need to do the eof zeroing found in async_filler? */
req = nfs_create_request(dreq->ctx, pagevec[i], NULL, req = nfs_create_request(dreq->ctx, pagevec[i],
pgbase, req_len); pgbase, req_len);
if (IS_ERR(req)) { if (IS_ERR(req)) {
result = PTR_ERR(req); result = PTR_ERR(req);
@ -899,7 +899,7 @@ static ssize_t nfs_direct_write_schedule_iovec(struct nfs_direct_req *dreq,
struct nfs_page *req; struct nfs_page *req;
unsigned int req_len = min_t(size_t, bytes, PAGE_SIZE - pgbase); unsigned int req_len = min_t(size_t, bytes, PAGE_SIZE - pgbase);
req = nfs_create_request(dreq->ctx, pagevec[i], NULL, req = nfs_create_request(dreq->ctx, pagevec[i],
pgbase, req_len); pgbase, req_len);
if (IS_ERR(req)) { if (IS_ERR(req)) {
result = PTR_ERR(req); result = PTR_ERR(req);

16
fs/nfs/pagelist.c
View File

@ -297,8 +297,8 @@ out:
static struct nfs_page * static struct nfs_page *
__nfs_create_request(struct nfs_lock_context *l_ctx, struct page *page, __nfs_create_request(struct nfs_lock_context *l_ctx, struct page *page,
struct nfs_page *last, unsigned int pgbase, unsigned int pgbase, unsigned int offset,
unsigned int offset, unsigned int count) unsigned int count)
{ {
struct nfs_page *req; struct nfs_page *req;
struct nfs_open_context *ctx = l_ctx->open_context; struct nfs_open_context *ctx = l_ctx->open_context;
@ -327,7 +327,6 @@ __nfs_create_request(struct nfs_lock_context *l_ctx, struct page *page,
req->wb_bytes = count; req->wb_bytes = count;
req->wb_context = get_nfs_open_context(ctx); req->wb_context = get_nfs_open_context(ctx);
kref_init(&req->wb_kref); kref_init(&req->wb_kref);
nfs_page_group_init(req, last);
return req; return req;
} }
@ -335,7 +334,6 @@ __nfs_create_request(struct nfs_lock_context *l_ctx, struct page *page,
* nfs_create_request - Create an NFS read/write request. * nfs_create_request - Create an NFS read/write request.
* @ctx: open context to use * @ctx: open context to use
* @page: page to write * @page: page to write
* @last: last nfs request created for this page group or NULL if head
* @offset: starting offset within the page for the write * @offset: starting offset within the page for the write
* @count: number of bytes to read/write * @count: number of bytes to read/write
* *
@ -345,15 +343,16 @@ __nfs_create_request(struct nfs_lock_context *l_ctx, struct page *page,
*/ */
struct nfs_page * struct nfs_page *
nfs_create_request(struct nfs_open_context *ctx, struct page *page, nfs_create_request(struct nfs_open_context *ctx, struct page *page,
struct nfs_page *last, unsigned int offset, unsigned int offset, unsigned int count)
unsigned int count)
{ {
struct nfs_lock_context *l_ctx = nfs_get_lock_context(ctx); struct nfs_lock_context *l_ctx = nfs_get_lock_context(ctx);
struct nfs_page *ret; struct nfs_page *ret;
if (IS_ERR(l_ctx)) if (IS_ERR(l_ctx))
return ERR_CAST(l_ctx); return ERR_CAST(l_ctx);
ret = __nfs_create_request(l_ctx, page, last, offset, offset, count); ret = __nfs_create_request(l_ctx, page, offset, offset, count);
if (!IS_ERR(ret))
nfs_page_group_init(ret, NULL);
nfs_put_lock_context(l_ctx); nfs_put_lock_context(l_ctx);
return ret; return ret;
} }
@ -365,11 +364,12 @@ nfs_create_subreq(struct nfs_page *req, struct nfs_page *last,
{ {
struct nfs_page *ret; struct nfs_page *ret;
ret = __nfs_create_request(req->wb_lock_context, req->wb_page, last, ret = __nfs_create_request(req->wb_lock_context, req->wb_page,
pgbase, offset, count); pgbase, offset, count);
if (!IS_ERR(ret)) { if (!IS_ERR(ret)) {
nfs_lock_request(ret); nfs_lock_request(ret);
ret->wb_index = req->wb_index; ret->wb_index = req->wb_index;
nfs_page_group_init(ret, last);
} }
return ret; return ret;
} }

4
fs/nfs/read.c
View File

@ -118,7 +118,7 @@ int nfs_readpage_async(struct nfs_open_context *ctx, struct inode *inode,
len = nfs_page_length(page); len = nfs_page_length(page);
if (len == 0) if (len == 0)
return nfs_return_empty_page(page); return nfs_return_empty_page(page);
new = nfs_create_request(ctx, page, NULL, 0, len); new = nfs_create_request(ctx, page, 0, len);
if (IS_ERR(new)) { if (IS_ERR(new)) {
unlock_page(page); unlock_page(page);
return PTR_ERR(new); return PTR_ERR(new);
@ -363,7 +363,7 @@ readpage_async_filler(void *data, struct page *page)
if (len == 0) if (len == 0)
return nfs_return_empty_page(page); return nfs_return_empty_page(page);
new = nfs_create_request(desc->ctx, page, NULL, 0, len); new = nfs_create_request(desc->ctx, page, 0, len);
if (IS_ERR(new)) if (IS_ERR(new))
goto out_error; goto out_error;

2
fs/nfs/write.c
View File

@ -1171,7 +1171,7 @@ static struct nfs_page * nfs_setup_write_request(struct nfs_open_context* ctx,
req = nfs_try_to_update_request(inode, page, offset, bytes); req = nfs_try_to_update_request(inode, page, offset, bytes);
if (req != NULL) if (req != NULL)
goto out; goto out;
req = nfs_create_request(ctx, page, NULL, offset, bytes); req = nfs_create_request(ctx, page, offset, bytes);
if (IS_ERR(req)) if (IS_ERR(req))
goto out; goto out;
nfs_inode_add_request(inode, req); nfs_inode_add_request(inode, req);

1
include/linux/nfs_page.h
View File

@ -114,7 +114,6 @@ struct nfs_pageio_descriptor {
extern struct nfs_page *nfs_create_request(struct nfs_open_context *ctx, extern struct nfs_page *nfs_create_request(struct nfs_open_context *ctx,
struct page *page, struct page *page,
struct nfs_page *last,
unsigned int offset, unsigned int offset,
unsigned int count); unsigned int count);
extern void nfs_release_request(struct nfs_page *); extern void nfs_release_request(struct nfs_page *);