diff options
Diffstat (limited to 'fs/nfs/direct.c')
-rw-r--r-- | fs/nfs/direct.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 33824a0a57bf..0fd811ac08b5 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c | |||
@@ -428,7 +428,7 @@ out_put: | |||
428 | hdr->release(hdr); | 428 | hdr->release(hdr); |
429 | } | 429 | } |
430 | 430 | ||
431 | static void nfs_read_sync_pgio_error(struct list_head *head) | 431 | static void nfs_read_sync_pgio_error(struct list_head *head, int error) |
432 | { | 432 | { |
433 | struct nfs_page *req; | 433 | struct nfs_page *req; |
434 | 434 | ||
@@ -664,8 +664,7 @@ static void nfs_direct_write_reschedule(struct nfs_direct_req *dreq) | |||
664 | 664 | ||
665 | list_for_each_entry_safe(req, tmp, &reqs, wb_list) { | 665 | list_for_each_entry_safe(req, tmp, &reqs, wb_list) { |
666 | if (!nfs_pageio_add_request(&desc, req)) { | 666 | if (!nfs_pageio_add_request(&desc, req)) { |
667 | nfs_list_remove_request(req); | 667 | nfs_list_move_request(req, &failed); |
668 | nfs_list_add_request(req, &failed); | ||
669 | spin_lock(&cinfo.inode->i_lock); | 668 | spin_lock(&cinfo.inode->i_lock); |
670 | dreq->flags = 0; | 669 | dreq->flags = 0; |
671 | if (desc.pg_error < 0) | 670 | if (desc.pg_error < 0) |
@@ -821,7 +820,7 @@ out_put: | |||
821 | hdr->release(hdr); | 820 | hdr->release(hdr); |
822 | } | 821 | } |
823 | 822 | ||
824 | static void nfs_write_sync_pgio_error(struct list_head *head) | 823 | static void nfs_write_sync_pgio_error(struct list_head *head, int error) |
825 | { | 824 | { |
826 | struct nfs_page *req; | 825 | struct nfs_page *req; |
827 | 826 | ||