diff options
Diffstat (limited to 'fs/nfs/pagelist.c')
| -rw-r--r-- | fs/nfs/pagelist.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/nfs/pagelist.c b/fs/nfs/pagelist.c index 1da68d3b1eda..4984bbe55ff1 100644 --- a/fs/nfs/pagelist.c +++ b/fs/nfs/pagelist.c | |||
| @@ -1100,8 +1100,6 @@ static int nfs_do_recoalesce(struct nfs_pageio_descriptor *desc) | |||
| 1100 | mirror->pg_base = 0; | 1100 | mirror->pg_base = 0; |
| 1101 | mirror->pg_recoalesce = 0; | 1101 | mirror->pg_recoalesce = 0; |
| 1102 | 1102 | ||
| 1103 | desc->pg_moreio = 0; | ||
| 1104 | |||
| 1105 | while (!list_empty(&head)) { | 1103 | while (!list_empty(&head)) { |
| 1106 | struct nfs_page *req; | 1104 | struct nfs_page *req; |
| 1107 | 1105 | ||
| @@ -1109,8 +1107,11 @@ static int nfs_do_recoalesce(struct nfs_pageio_descriptor *desc) | |||
| 1109 | nfs_list_remove_request(req); | 1107 | nfs_list_remove_request(req); |
| 1110 | if (__nfs_pageio_add_request(desc, req)) | 1108 | if (__nfs_pageio_add_request(desc, req)) |
| 1111 | continue; | 1109 | continue; |
| 1112 | if (desc->pg_error < 0) | 1110 | if (desc->pg_error < 0) { |
| 1111 | list_splice_tail(&head, &mirror->pg_list); | ||
| 1112 | mirror->pg_recoalesce = 1; | ||
| 1113 | return 0; | 1113 | return 0; |
| 1114 | } | ||
| 1114 | break; | 1115 | break; |
| 1115 | } | 1116 | } |
| 1116 | } while (mirror->pg_recoalesce); | 1117 | } while (mirror->pg_recoalesce); |
