diff options
Diffstat (limited to 'fs/nfs/pnfs.c')
-rw-r--r-- | fs/nfs/pnfs.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index cb53d450ae32..9edac9f01c2a 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c | |||
@@ -1447,20 +1447,6 @@ pnfs_pageio_init_read(struct nfs_pageio_descriptor *pgio, struct inode *inode, | |||
1447 | nfs_pageio_init(pgio, inode, ld->pg_read_ops, compl_ops, server->rsize, 0); | 1447 | nfs_pageio_init(pgio, inode, ld->pg_read_ops, compl_ops, server->rsize, 0); |
1448 | } | 1448 | } |
1449 | 1449 | ||
1450 | void | ||
1451 | pnfs_pageio_init_write(struct nfs_pageio_descriptor *pgio, struct inode *inode, | ||
1452 | int ioflags, | ||
1453 | const struct nfs_pgio_completion_ops *compl_ops) | ||
1454 | { | ||
1455 | struct nfs_server *server = NFS_SERVER(inode); | ||
1456 | struct pnfs_layoutdriver_type *ld = server->pnfs_curr_ld; | ||
1457 | |||
1458 | if (ld == NULL) | ||
1459 | nfs_pageio_init_write(pgio, inode, ioflags, compl_ops); | ||
1460 | else | ||
1461 | nfs_pageio_init(pgio, inode, ld->pg_write_ops, compl_ops, server->wsize, ioflags); | ||
1462 | } | ||
1463 | |||
1464 | bool | 1450 | bool |
1465 | pnfs_generic_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev, | 1451 | pnfs_generic_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev, |
1466 | struct nfs_page *req) | 1452 | struct nfs_page *req) |
@@ -1496,7 +1482,7 @@ int pnfs_write_done_resend_to_mds(struct inode *inode, | |||
1496 | LIST_HEAD(failed); | 1482 | LIST_HEAD(failed); |
1497 | 1483 | ||
1498 | /* Resend all requests through the MDS */ | 1484 | /* Resend all requests through the MDS */ |
1499 | nfs_pageio_init_write(&pgio, inode, FLUSH_STABLE, compl_ops); | 1485 | nfs_pageio_init_write(&pgio, inode, FLUSH_STABLE, true, compl_ops); |
1500 | pgio.pg_dreq = dreq; | 1486 | pgio.pg_dreq = dreq; |
1501 | while (!list_empty(head)) { | 1487 | while (!list_empty(head)) { |
1502 | struct nfs_page *req = nfs_list_entry(head->next); | 1488 | struct nfs_page *req = nfs_list_entry(head->next); |