diff options
Diffstat (limited to 'fs/nfs')
-rw-r--r-- | fs/nfs/direct.c | 3 | ||||
-rw-r--r-- | fs/nfs/nfs4proc.c | 4 | ||||
-rw-r--r-- | fs/nfs/write.c | 3 |
3 files changed, 10 insertions, 0 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 1955bfeb3551..489fc01a3204 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c | |||
@@ -538,6 +538,9 @@ static void nfs_direct_commit_release(void *calldata) | |||
538 | } | 538 | } |
539 | 539 | ||
540 | static const struct rpc_call_ops nfs_commit_direct_ops = { | 540 | static const struct rpc_call_ops nfs_commit_direct_ops = { |
541 | #if defined(CONFIG_NFS_V4_1) | ||
542 | .rpc_call_prepare = nfs_write_prepare, | ||
543 | #endif /* CONFIG_NFS_V4_1 */ | ||
541 | .rpc_call_done = nfs_direct_commit_result, | 544 | .rpc_call_done = nfs_direct_commit_result, |
542 | .rpc_release = nfs_direct_commit_release, | 545 | .rpc_release = nfs_direct_commit_release, |
543 | }; | 546 | }; |
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 5f71832436fd..fbd6274f14f8 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
@@ -2920,10 +2920,14 @@ static int nfs4_commit_done(struct rpc_task *task, struct nfs_write_data *data) | |||
2920 | { | 2920 | { |
2921 | struct inode *inode = data->inode; | 2921 | struct inode *inode = data->inode; |
2922 | 2922 | ||
2923 | nfs4_sequence_done(NFS_SERVER(inode), &data->res.seq_res, | ||
2924 | task->tk_status); | ||
2923 | if (nfs4_async_handle_error(task, NFS_SERVER(inode), NULL) == -EAGAIN) { | 2925 | if (nfs4_async_handle_error(task, NFS_SERVER(inode), NULL) == -EAGAIN) { |
2924 | rpc_restart_call(task); | 2926 | rpc_restart_call(task); |
2925 | return -EAGAIN; | 2927 | return -EAGAIN; |
2926 | } | 2928 | } |
2929 | nfs4_sequence_free_slot(NFS_SERVER(inode)->nfs_client, | ||
2930 | &data->res.seq_res); | ||
2927 | nfs_refresh_inode(inode, data->res.fattr); | 2931 | nfs_refresh_inode(inode, data->res.fattr); |
2928 | return 0; | 2932 | return 0; |
2929 | } | 2933 | } |
diff --git a/fs/nfs/write.c b/fs/nfs/write.c index 195fe7667529..85a76409de13 100644 --- a/fs/nfs/write.c +++ b/fs/nfs/write.c | |||
@@ -1373,6 +1373,9 @@ static void nfs_commit_release(void *calldata) | |||
1373 | } | 1373 | } |
1374 | 1374 | ||
1375 | static const struct rpc_call_ops nfs_commit_ops = { | 1375 | static const struct rpc_call_ops nfs_commit_ops = { |
1376 | #if defined(CONFIG_NFS_V4_1) | ||
1377 | .rpc_call_prepare = nfs_write_prepare, | ||
1378 | #endif /* CONFIG_NFS_V4_1 */ | ||
1376 | .rpc_call_done = nfs_commit_done, | 1379 | .rpc_call_done = nfs_commit_done, |
1377 | .rpc_release = nfs_commit_release, | 1380 | .rpc_release = nfs_commit_release, |
1378 | }; | 1381 | }; |