iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFS: Pass error information to the pgio error cleanup routine

Browse Source 
[ Upstream commit df3accb849 ]

Allow the caller to pass error information when cleaning up a failed
I/O request so that we can conditionally take action to cancel the
request altogether if the error turned out to be fatal.

Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Trond Myklebust
2019-02-13 10:39:39 -05:00
committed by Greg Kroah-Hartman
parent ae63bd38d0
commit e4ca24bdce
5 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fs/nfs/direct.c
View File

@ -428,7 +428,7 @@ out_put:
hdr->release(hdr); hdr->release(hdr);
} }
static void nfs_read_sync_pgio_error(struct list_head *head) static void nfs_read_sync_pgio_error(struct list_head *head, int error)
{ {
struct nfs_page *req; struct nfs_page *req;
@ -820,7 +820,7 @@ out_put:
hdr->release(hdr); hdr->release(hdr);
} }
static void nfs_write_sync_pgio_error(struct list_head *head) static void nfs_write_sync_pgio_error(struct list_head *head, int error)
{ {
struct nfs_page *req; struct nfs_page *req;

5
fs/nfs/pagelist.c
View File

@ -993,7 +993,7 @@ nfs_pageio_cleanup_request(struct nfs_pageio_descriptor *desc,
LIST_HEAD(head); LIST_HEAD(head);
nfs_list_move_request(req, &head); nfs_list_move_request(req, &head);
desc->pg_completion_ops->error_cleanup(&head); desc->pg_completion_ops->error_cleanup(&head, desc->pg_error);
} }
/** /**
@ -1129,7 +1129,8 @@ static void nfs_pageio_error_cleanup(struct nfs_pageio_descriptor *desc)
for (midx = 0; midx < desc->pg_mirror_count; midx++) { for (midx = 0; midx < desc->pg_mirror_count; midx++) {
mirror = &desc->pg_mirrors[midx]; mirror = &desc->pg_mirrors[midx];
desc->pg_completion_ops->error_cleanup(&mirror->pg_list); desc->pg_completion_ops->error_cleanup(&mirror->pg_list,
desc->pg_error);
} }
} }

2
fs/nfs/read.c
View File

@ -205,7 +205,7 @@ static void nfs_initiate_read(struct nfs_pgio_header *hdr,
} }
static void static void
nfs_async_read_error(struct list_head *head) nfs_async_read_error(struct list_head *head, int error)
{ {
struct nfs_page *req; struct nfs_page *req;

11
fs/nfs/write.c
View File

@ -1397,20 +1397,27 @@ static void nfs_redirty_request(struct nfs_page *req)
nfs_release_request(req); nfs_release_request(req);
} }
static void nfs_async_write_error(struct list_head *head) static void nfs_async_write_error(struct list_head *head, int error)
{ {
struct nfs_page *req; struct nfs_page *req;
while (!list_empty(head)) { while (!list_empty(head)) {
req = nfs_list_entry(head->next); req = nfs_list_entry(head->next);
nfs_list_remove_request(req); nfs_list_remove_request(req);
if (nfs_error_is_fatal(error)) {
nfs_context_set_write_error(req->wb_context, error);
if (nfs_error_is_fatal_on_server(error)) {
nfs_write_error_remove_page(req);
continue;
}
}
nfs_redirty_request(req); nfs_redirty_request(req);
} }
} }
static void nfs_async_write_reschedule_io(struct nfs_pgio_header *hdr) static void nfs_async_write_reschedule_io(struct nfs_pgio_header *hdr)
{ {
nfs_async_write_error(&hdr->pages); nfs_async_write_error(&hdr->pages, 0);
} }
static const struct nfs_pgio_completion_ops nfs_async_write_completion_ops = { static const struct nfs_pgio_completion_ops nfs_async_write_completion_ops = {

2
include/linux/nfs_xdr.h
View File

@ -1520,7 +1520,7 @@ struct nfs_commit_data {
}; };
struct nfs_pgio_completion_ops { struct nfs_pgio_completion_ops {
void (*error_cleanup)(struct list_head *head); void (*error_cleanup)(struct list_head *head, int);
void (*init_hdr)(struct nfs_pgio_header *hdr); void (*init_hdr)(struct nfs_pgio_header *hdr);
void (*completion)(struct nfs_pgio_header *hdr); void (*completion)(struct nfs_pgio_header *hdr);
void (*reschedule_io)(struct nfs_pgio_header *hdr); void (*reschedule_io)(struct nfs_pgio_header *hdr);