nfs: remove unused arg from nfs_create_request
@inode is passed but not used. Signed-off-by: Weston Andros Adamson <dros@primarydata.com> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
parent
12c0579259
commit
8c8f1ac109
5 changed files with 6 additions and 12 deletions
|
@ -380,8 +380,7 @@ static ssize_t nfs_direct_read_schedule_segment(struct nfs_pageio_descriptor *de
|
||||||
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, dreq->inode,
|
req = nfs_create_request(dreq->ctx, pagevec[i],
|
||||||
pagevec[i],
|
|
||||||
pgbase, req_len);
|
pgbase, req_len);
|
||||||
if (IS_ERR(req)) {
|
if (IS_ERR(req)) {
|
||||||
result = PTR_ERR(req);
|
result = PTR_ERR(req);
|
||||||
|
@ -750,8 +749,7 @@ static ssize_t nfs_direct_write_schedule_segment(struct nfs_pageio_descriptor *d
|
||||||
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, dreq->inode,
|
req = nfs_create_request(dreq->ctx, pagevec[i],
|
||||||
pagevec[i],
|
|
||||||
pgbase, req_len);
|
pgbase, req_len);
|
||||||
if (IS_ERR(req)) {
|
if (IS_ERR(req)) {
|
||||||
result = PTR_ERR(req);
|
result = PTR_ERR(req);
|
||||||
|
|
|
@ -139,7 +139,6 @@ nfs_iocounter_wait(struct nfs_io_counter *c)
|
||||||
/**
|
/**
|
||||||
* 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
|
||||||
* @inode: inode to which the request is attached
|
|
||||||
* @page: page to write
|
* @page: page to write
|
||||||
* @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
|
||||||
|
@ -149,8 +148,7 @@ nfs_iocounter_wait(struct nfs_io_counter *c)
|
||||||
* User should ensure it is safe to sleep in this function.
|
* User should ensure it is safe to sleep in this function.
|
||||||
*/
|
*/
|
||||||
struct nfs_page *
|
struct nfs_page *
|
||||||
nfs_create_request(struct nfs_open_context *ctx, struct inode *inode,
|
nfs_create_request(struct nfs_open_context *ctx, struct page *page,
|
||||||
struct page *page,
|
|
||||||
unsigned int offset, unsigned int count)
|
unsigned int offset, unsigned int count)
|
||||||
{
|
{
|
||||||
struct nfs_page *req;
|
struct nfs_page *req;
|
||||||
|
|
|
@ -85,7 +85,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, inode, page, 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);
|
||||||
|
@ -303,7 +303,6 @@ static int
|
||||||
readpage_async_filler(void *data, struct page *page)
|
readpage_async_filler(void *data, struct page *page)
|
||||||
{
|
{
|
||||||
struct nfs_readdesc *desc = (struct nfs_readdesc *)data;
|
struct nfs_readdesc *desc = (struct nfs_readdesc *)data;
|
||||||
struct inode *inode = page_file_mapping(page)->host;
|
|
||||||
struct nfs_page *new;
|
struct nfs_page *new;
|
||||||
unsigned int len;
|
unsigned int len;
|
||||||
int error;
|
int error;
|
||||||
|
@ -312,7 +311,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, inode, page, 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;
|
||||||
|
|
||||||
|
|
|
@ -761,7 +761,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, inode, page, 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);
|
||||||
|
|
|
@ -85,7 +85,6 @@ struct nfs_pageio_descriptor {
|
||||||
#define NFS_WBACK_BUSY(req) (test_bit(PG_BUSY,&(req)->wb_flags))
|
#define NFS_WBACK_BUSY(req) (test_bit(PG_BUSY,&(req)->wb_flags))
|
||||||
|
|
||||||
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 inode *inode,
|
|
||||||
struct page *page,
|
struct page *page,
|
||||||
unsigned int offset,
|
unsigned int offset,
|
||||||
unsigned int count);
|
unsigned int count);
|
||||||
|
|
Loading…
Add table
Reference in a new issue