summaryrefslogtreecommitdiffstats
path: root/fs/nfs/direct.c
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@hammerspace.com>2019-02-13 10:39:39 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-09-06 10:21:00 +0200
commite4ca24bdcea96cf5143afe197b649060b40d5fd8 (patch)
treed3f7735ef985ffde49deadc4b8991530181fdace /fs/nfs/direct.c
parentae63bd38d03afe36ba0b6d0b6f6fea0157d79718 (diff)
downloadlinux-stable-e4ca24bdcea96cf5143afe197b649060b40d5fd8.tar.gz
linux-stable-e4ca24bdcea96cf5143afe197b649060b40d5fd8.tar.bz2
linux-stable-e4ca24bdcea96cf5143afe197b649060b40d5fd8.zip
NFS: Pass error information to the pgio error cleanup routine
[ Upstream commit df3accb849607a86278a37c35e6b313635ccc48b ] 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>
Diffstat (limited to 'fs/nfs/direct.c')
-rw-r--r--fs/nfs/direct.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index 0c5e56702b19..2256ea4394d3 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -428,7 +428,7 @@ out_put:
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;
@@ -820,7 +820,7 @@ out_put:
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;