| @@ -1071,6 +1071,8 @@ static int ff_layout_async_handle_error_v4(struct rpc_task *task, · 1070 unmodified lines |
| 1071 | break; | 1071 | break; |
| 1072 | case -NFS4ERR_RETRY_UNCACHED_REP: | 1072 | case -NFS4ERR_RETRY_UNCACHED_REP: |
| 1073 | break; | 1073 | break; |
| | 1074 | case -EAGAIN: |
| | 1075 | return -NFS4ERR_RESET_TO_PNFS; |
| 1074 | /* Invalidate Layout errors */ | 1076 | /* Invalidate Layout errors */ |
| 1075 | case -NFS4ERR_PNFS_NO_LAYOUT: | 1077 | case -NFS4ERR_PNFS_NO_LAYOUT: |
| 1076 | case -ESTALE: /* mapped NFS4ERR_STALE */ | 1078 | case -ESTALE: /* mapped NFS4ERR_STALE */ |
| @@ -1131,6 +1133,7 @@ static int ff_layout_async_handle_error_v3(struct rpc_task *task, · 54 unmodified lines |
| 1131 | case -EBADHANDLE: | 1133 | case -EBADHANDLE: |
| 1132 | case -ELOOP: | 1134 | case -ELOOP: |
| 1133 | case -ENOSPC: | 1135 | case -ENOSPC: |
| | 1136 | case -EAGAIN: |
| 1134 | break; | 1137 | break; |
| 1135 | case -EJUKEBOX: | 1138 | case -EJUKEBOX: |
| 1136 | nfs_inc_stats(lseg->pls_layout->plh_inode, NFSIOS_DELAY); | 1139 | nfs_inc_stats(lseg->pls_layout->plh_inode, NFSIOS_DELAY); |
| @@ -1369,6 +1372,16 @@ static void ff_layout_read_prepare_v4(struct rpc_task *task, void *data) · 232 unmodified lines |
| 1369 | ff_layout_read_prepare_common(task, hdr); | 1372 | ff_layout_read_prepare_common(task, hdr); |
| 1370 | } | 1373 | } |
| 1371 | | 1374 | |
| | 1375 | static void |
| | 1376 | ff_layout_io_prepare_transmit(struct rpc_task *task, |
| | 1377 | void *data) |
| | 1378 | { |
| | 1379 | struct nfs_pgio_header *hdr = data; |
| | 1380 | |
| | 1381 | if (!pnfs_is_valid_lseg(hdr->lseg)) |
| | 1382 | rpc_exit(task, -EAGAIN); |
| | 1383 | } |
| | 1384 | |
| 1372 | static void ff_layout_read_call_done(struct rpc_task *task, void *data) | 1385 | static void ff_layout_read_call_done(struct rpc_task *task, void *data) |
| 1373 | { | 1386 | { |
| 1374 | struct nfs_pgio_header *hdr = data; | 1387 | struct nfs_pgio_header *hdr = data; |
| @@ -1657,6 +1670,7 @@ static void ff_layout_commit_release(void *data) · 282 unmodified lines |
| 1657 | | 1670 | |
| 1658 | static const struct rpc_call_ops ff_layout_read_call_ops_v3 = { | 1671 | static const struct rpc_call_ops ff_layout_read_call_ops_v3 = { |
| 1659 | .rpc_call_prepare = ff_layout_read_prepare_v3, | 1672 | .rpc_call_prepare = ff_layout_read_prepare_v3, |
| | 1673 | .rpc_call_prepare_transmit = ff_layout_io_prepare_transmit, |
| 1660 | .rpc_call_done = ff_layout_read_call_done, | 1674 | .rpc_call_done = ff_layout_read_call_done, |
| 1661 | .rpc_count_stats = ff_layout_read_count_stats, | 1675 | .rpc_count_stats = ff_layout_read_count_stats, |
| 1662 | .rpc_release = ff_layout_read_release, | 1676 | .rpc_release = ff_layout_read_release, |
| @@ -1664,6 +1678,7 @@ static const struct rpc_call_ops ff_layout_read_call_ops_v3 = { · 1 unmodified line |
| 1664 | | 1678 | |
| 1665 | static const struct rpc_call_ops ff_layout_read_call_ops_v4 = { | 1679 | static const struct rpc_call_ops ff_layout_read_call_ops_v4 = { |
| 1666 | .rpc_call_prepare = ff_layout_read_prepare_v4, | 1680 | .rpc_call_prepare = ff_layout_read_prepare_v4, |
| | 1681 | .rpc_call_prepare_transmit = ff_layout_io_prepare_transmit, |
| 1667 | .rpc_call_done = ff_layout_read_call_done, | 1682 | .rpc_call_done = ff_layout_read_call_done, |
| 1668 | .rpc_count_stats = ff_layout_read_count_stats, | 1683 | .rpc_count_stats = ff_layout_read_count_stats, |
| 1669 | .rpc_release = ff_layout_read_release, | 1684 | .rpc_release = ff_layout_read_release, |
| @@ -1671,6 +1686,7 @@ static const struct rpc_call_ops ff_layout_read_call_ops_v4 = { · 1 unmodified line |
| 1671 | | 1686 | |
| 1672 | static const struct rpc_call_ops ff_layout_write_call_ops_v3 = { | 1687 | static const struct rpc_call_ops ff_layout_write_call_ops_v3 = { |
| 1673 | .rpc_call_prepare = ff_layout_write_prepare_v3, | 1688 | .rpc_call_prepare = ff_layout_write_prepare_v3, |
| | 1689 | .rpc_call_prepare_transmit = ff_layout_io_prepare_transmit, |
| 1674 | .rpc_call_done = ff_layout_write_call_done, | 1690 | .rpc_call_done = ff_layout_write_call_done, |
| 1675 | .rpc_count_stats = ff_layout_write_count_stats, | 1691 | .rpc_count_stats = ff_layout_write_count_stats, |
| 1676 | .rpc_release = ff_layout_write_release, | 1692 | .rpc_release = ff_layout_write_release, |
| @@ -1678,6 +1694,7 @@ static const struct rpc_call_ops ff_layout_write_call_ops_v3 = { · 1 unmodified line |
| 1678 | | 1694 | |
| 1679 | static const struct rpc_call_ops ff_layout_write_call_ops_v4 = { | 1695 | static const struct rpc_call_ops ff_layout_write_call_ops_v4 = { |
| 1680 | .rpc_call_prepare = ff_layout_write_prepare_v4, | 1696 | .rpc_call_prepare = ff_layout_write_prepare_v4, |
| | 1697 | .rpc_call_prepare_transmit = ff_layout_io_prepare_transmit, |
| 1681 | .rpc_call_done = ff_layout_write_call_done, | 1698 | .rpc_call_done = ff_layout_write_call_done, |
| 1682 | .rpc_count_stats = ff_layout_write_count_stats, | 1699 | .rpc_count_stats = ff_layout_write_count_stats, |
| 1683 | .rpc_release = ff_layout_write_release, | 1700 | .rpc_release = ff_layout_write_release, |