diff options
author | Weston Andros Adamson <dros@primarydata.com> | 2014-05-15 11:56:42 -0400 |
---|---|---|
committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-05-29 11:11:43 -0400 |
commit | 8c8f1ac109726e4ed44a920f5c962c84610d4a17 (patch) | |
tree | 8109ea345efe64ef00262c92c17ec39e06cd2b51 | |
parent | 12c05792599ec57ebab33096b2c75b863dfe6ea4 (diff) |
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>
-rw-r--r-- | fs/nfs/direct.c | 6 | ||||
-rw-r--r-- | fs/nfs/pagelist.c | 4 | ||||
-rw-r--r-- | fs/nfs/read.c | 5 | ||||
-rw-r--r-- | fs/nfs/write.c | 2 | ||||
-rw-r--r-- | include/linux/nfs_page.h | 1 |
5 files changed, 6 insertions, 12 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 164b0167677b..1dd8c622d719 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c | |||
@@ -380,8 +380,7 @@ static ssize_t nfs_direct_read_schedule_segment(struct nfs_pageio_descriptor *de | |||
380 | struct nfs_page *req; | 380 | struct nfs_page *req; |
381 | unsigned int req_len = min_t(size_t, bytes, PAGE_SIZE - pgbase); | 381 | unsigned int req_len = min_t(size_t, bytes, PAGE_SIZE - pgbase); |
382 | /* XXX do we need to do the eof zeroing found in async_filler? */ | 382 | /* XXX do we need to do the eof zeroing found in async_filler? */ |
383 | req = nfs_create_request(dreq->ctx, dreq->inode, | 383 | req = nfs_create_request(dreq->ctx, pagevec[i], |
384 | pagevec[i], | ||
385 | pgbase, req_len); | 384 | pgbase, req_len); |
386 | if (IS_ERR(req)) { | 385 | if (IS_ERR(req)) { |
387 | result = PTR_ERR(req); | 386 | result = PTR_ERR(req); |
@@ -750,8 +749,7 @@ static ssize_t nfs_direct_write_schedule_segment(struct nfs_pageio_descriptor *d | |||
750 | struct nfs_page *req; | 749 | struct nfs_page *req; |
751 | unsigned int req_len = min_t(size_t, bytes, PAGE_SIZE - pgbase); | 750 | unsigned int req_len = min_t(size_t, bytes, PAGE_SIZE - pgbase); |
752 | 751 | ||
753 | req = nfs_create_request(dreq->ctx, dreq->inode, | 752 | req = nfs_create_request(dreq->ctx, pagevec[i], |
754 | pagevec[i], | ||
755 | pgbase, req_len); | 753 | pgbase, req_len); |
756 | if (IS_ERR(req)) { | 754 | if (IS_ERR(req)) { |
757 | result = PTR_ERR(req); | 755 | result = PTR_ERR(req); |
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index 29591094125a..4b4b212ec6b2 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c | |||
@@ -139,7 +139,6 @@ nfs_iocounter_wait(struct nfs_io_counter *c) | |||
139 | /** | 139 | /** |
140 | * nfs_create_request - Create an NFS read/write request. | 140 | * nfs_create_request - Create an NFS read/write request. |
141 | * @ctx: open context to use | 141 | * @ctx: open context to use |
142 | * @inode: inode to which the request is attached | ||
143 | * @page: page to write | 142 | * @page: page to write |
144 | * @offset: starting offset within the page for the write | 143 | * @offset: starting offset within the page for the write |
145 | * @count: number of bytes to read/write | 144 | * @count: number of bytes to read/write |
@@ -149,8 +148,7 @@ nfs_iocounter_wait(struct nfs_io_counter *c) | |||
149 | * User should ensure it is safe to sleep in this function. | 148 | * User should ensure it is safe to sleep in this function. |
150 | */ | 149 | */ |
151 | struct nfs_page * | 150 | struct nfs_page * |
152 | nfs_create_request(struct nfs_open_context *ctx, struct inode *inode, | 151 | nfs_create_request(struct nfs_open_context *ctx, struct page *page, |
153 | struct page *page, | ||
154 | unsigned int offset, unsigned int count) | 152 | unsigned int offset, unsigned int count) |
155 | { | 153 | { |
156 | struct nfs_page *req; | 154 | struct nfs_page *req; |
diff --git a/fs/nfs/read.c b/fs/nfs/read.c index 3986668e4390..46d90448f69b 100644 --- a/fs/nfs/read.c +++ b/fs/nfs/read.c | |||
@@ -85,7 +85,7 @@ int nfs_readpage_async(struct nfs_open_context *ctx, struct inode *inode, | |||
85 | len = nfs_page_length(page); | 85 | len = nfs_page_length(page); |
86 | if (len == 0) | 86 | if (len == 0) |
87 | return nfs_return_empty_page(page); | 87 | return nfs_return_empty_page(page); |
88 | new = nfs_create_request(ctx, inode, page, 0, len); | 88 | new = nfs_create_request(ctx, page, 0, len); |
89 | if (IS_ERR(new)) { | 89 | if (IS_ERR(new)) { |
90 | unlock_page(page); | 90 | unlock_page(page); |
91 | return PTR_ERR(new); | 91 | return PTR_ERR(new); |
@@ -303,7 +303,6 @@ static int | |||
303 | readpage_async_filler(void *data, struct page *page) | 303 | readpage_async_filler(void *data, struct page *page) |
304 | { | 304 | { |
305 | struct nfs_readdesc *desc = (struct nfs_readdesc *)data; | 305 | struct nfs_readdesc *desc = (struct nfs_readdesc *)data; |
306 | struct inode *inode = page_file_mapping(page)->host; | ||
307 | struct nfs_page *new; | 306 | struct nfs_page *new; |
308 | unsigned int len; | 307 | unsigned int len; |
309 | int error; | 308 | int error; |
@@ -312,7 +311,7 @@ readpage_async_filler(void *data, struct page *page) | |||
312 | if (len == 0) | 311 | if (len == 0) |
313 | return nfs_return_empty_page(page); | 312 | return nfs_return_empty_page(page); |
314 | 313 | ||
315 | new = nfs_create_request(desc->ctx, inode, page, 0, len); | 314 | new = nfs_create_request(desc->ctx, page, 0, len); |
316 | if (IS_ERR(new)) | 315 | if (IS_ERR(new)) |
317 | goto out_error; | 316 | goto out_error; |
318 | 317 | ||
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 2680f29f8a51..e773df207c05 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c | |||
@@ -761,7 +761,7 @@ static struct nfs_page * nfs_setup_write_request(struct nfs_open_context* ctx, | |||
761 | req = nfs_try_to_update_request(inode, page, offset, bytes); | 761 | req = nfs_try_to_update_request(inode, page, offset, bytes); |
762 | if (req != NULL) | 762 | if (req != NULL) |
763 | goto out; | 763 | goto out; |
764 | req = nfs_create_request(ctx, inode, page, offset, bytes); | 764 | req = nfs_create_request(ctx, page, offset, bytes); |
765 | if (IS_ERR(req)) | 765 | if (IS_ERR(req)) |
766 | goto out; | 766 | goto out; |
767 | nfs_inode_add_request(inode, req); | 767 | nfs_inode_add_request(inode, req); |
diff --git a/include/linux/nfs_page.h b/include/linux/nfs_page.h index eb2eb6396874..be0b0981e7a0 100644 --- a/include/linux/nfs_page.h +++ b/include/linux/nfs_page.h | |||
@@ -85,7 +85,6 @@ struct nfs_pageio_descriptor { | |||
85 | #define NFS_WBACK_BUSY(req) (test_bit(PG_BUSY,&(req)->wb_flags)) | 85 | #define NFS_WBACK_BUSY(req) (test_bit(PG_BUSY,&(req)->wb_flags)) |
86 | 86 | ||
87 | extern struct nfs_page *nfs_create_request(struct nfs_open_context *ctx, | 87 | extern struct nfs_page *nfs_create_request(struct nfs_open_context *ctx, |
88 | struct inode *inode, | ||
89 | struct page *page, | 88 | struct page *page, |
90 | unsigned int offset, | 89 | unsigned int offset, |
91 | unsigned int count); | 90 | unsigned int count); |