diff options
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/direct.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 4c97e55e86ee..f1b153ad645b 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c | |||
| @@ -295,9 +295,14 @@ static ssize_t nfs_direct_read_schedule(struct nfs_direct_req *dreq, unsigned lo | |||
| 295 | break; | 295 | break; |
| 296 | } | 296 | } |
| 297 | if ((unsigned)result < data->npages) { | 297 | if ((unsigned)result < data->npages) { |
| 298 | nfs_direct_release_pages(data->pagevec, result); | 298 | bytes = result * PAGE_SIZE; |
| 299 | nfs_readdata_release(data); | 299 | if (bytes <= pgbase) { |
| 300 | break; | 300 | nfs_direct_release_pages(data->pagevec, result); |
| 301 | nfs_readdata_release(data); | ||
| 302 | break; | ||
| 303 | } | ||
| 304 | bytes -= pgbase; | ||
| 305 | data->npages = result; | ||
| 301 | } | 306 | } |
| 302 | 307 | ||
| 303 | get_dreq(dreq); | 308 | get_dreq(dreq); |
| @@ -630,9 +635,14 @@ static ssize_t nfs_direct_write_schedule(struct nfs_direct_req *dreq, unsigned l | |||
| 630 | break; | 635 | break; |
| 631 | } | 636 | } |
| 632 | if ((unsigned)result < data->npages) { | 637 | if ((unsigned)result < data->npages) { |
| 633 | nfs_direct_release_pages(data->pagevec, result); | 638 | bytes = result * PAGE_SIZE; |
| 634 | nfs_writedata_release(data); | 639 | if (bytes <= pgbase) { |
| 635 | break; | 640 | nfs_direct_release_pages(data->pagevec, result); |
| 641 | nfs_writedata_release(data); | ||
| 642 | break; | ||
| 643 | } | ||
| 644 | bytes -= pgbase; | ||
| 645 | data->npages = result; | ||
| 636 | } | 646 | } |
| 637 | 647 | ||
| 638 | get_dreq(dreq); | 648 | get_dreq(dreq); |