diff options
| author | Anna Schumaker <Anna.Schumaker@Netapp.com> | 2017-04-07 14:15:08 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2017-04-20 13:39:33 -0400 |
| commit | fe4f844d49768909150d9c91e283106adcd9a1ea (patch) | |
| tree | dc28c2045aa11c7b20ba2d7e2cd57be8f4bd8a14 /fs/nfs/direct.c | |
| parent | beeb53380138231eacdf4fcbf78275d94db26f7f (diff) | |
| download | linux-fe4f844d49768909150d9c91e283106adcd9a1ea.tar.gz | |
NFS: Clean up nfs_direct_commit_complete()
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs/direct.c')
| -rw-r--r-- | fs/nfs/direct.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index 0b65e25b71ac..18d0868ee274 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -685,16 +685,9 @@ static void nfs_direct_commit_complete(struct nfs_commit_data *data) int status = data->task.tk_status; nfs_init_cinfo_from_dreq(&cinfo, dreq); - if (status < 0) { - dprintk("NFS: %5u commit failed with error %d.\n", - data->task.tk_pid, status); + if (status < 0 || nfs_direct_cmp_commit_data_verf(dreq, data)) dreq->flags = NFS_ODIRECT_RESCHED_WRITES; - } else if (nfs_direct_cmp_commit_data_verf(dreq, data)) { - dprintk("NFS: %5u commit verify failed\n", data->task.tk_pid); - dreq->flags = NFS_ODIRECT_RESCHED_WRITES; - } - dprintk("NFS: %5u commit returned %d\n", data->task.tk_pid, status); while (!list_empty(&data->pages)) { req = nfs_list_entry(data->pages.next); nfs_list_remove_request(req); |