diff options
author | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-07-13 15:13:19 -0400 |
---|---|---|
committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2014-07-13 15:18:44 -0400 |
commit | f563b89b182594f827b4100bd34f916339785a77 (patch) | |
tree | cb8b6cc7f2d4605abcabadb85b003614b5761f65 /fs/nfs/pagelist.c | |
parent | aafe37504c70954fc104c88d9d15d553572dae69 (diff) |
NFS: Don't reset pg_moreio in __nfs_pageio_add_request
Once we've started sending unstable NFS writes, we do not want to
clear pg_moreio, or we may end up sending the very last request as
a stable write if the commit lists are still empty.
Do, however, reset pg_moreio in the case where we end up having to
recoalesce the write if an attempt to use pNFS failed.
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs/pagelist.c')
-rw-r--r-- | fs/nfs/pagelist.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index 0aefc8102b6b..17fab89f6358 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c | |||
@@ -935,7 +935,6 @@ static int __nfs_pageio_add_request(struct nfs_pageio_descriptor *desc, | |||
935 | nfs_pageio_doio(desc); | 935 | nfs_pageio_doio(desc); |
936 | if (desc->pg_error < 0) | 936 | if (desc->pg_error < 0) |
937 | return 0; | 937 | return 0; |
938 | desc->pg_moreio = 0; | ||
939 | if (desc->pg_recoalesce) | 938 | if (desc->pg_recoalesce) |
940 | return 0; | 939 | return 0; |
941 | /* retry add_request for this subreq */ | 940 | /* retry add_request for this subreq */ |
@@ -982,6 +981,7 @@ static int nfs_do_recoalesce(struct nfs_pageio_descriptor *desc) | |||
982 | desc->pg_count = 0; | 981 | desc->pg_count = 0; |
983 | desc->pg_base = 0; | 982 | desc->pg_base = 0; |
984 | desc->pg_recoalesce = 0; | 983 | desc->pg_recoalesce = 0; |
984 | desc->pg_moreio = 0; | ||
985 | 985 | ||
986 | while (!list_empty(&head)) { | 986 | while (!list_empty(&head)) { |
987 | struct nfs_page *req; | 987 | struct nfs_page *req; |