NFS: Fix for bug in handling of errors for O_DIRECT writes
authorNeil Brown <neilb@suse.de>
Tue, 23 Oct 2007 21:09:13 +0000 (17:09 -0400)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 23 Oct 2007 23:41:21 +0000 (16:41 -0700)
commit432409eebcdec38ff6fa949f097b5438d588faa5
tree4418076abd99c105dd0ea68e9d33c2dd2333b6c0
parenta7aed1c2dc4939d1d61285c738ad32700d791692
NFS: Fix for bug in handling of errors for O_DIRECT writes

Commit eda3cef8dd2b83875affe82595db9d0c278879b2 ("NFS: Fix error
handling in nfs_direct_write_result()") ensured that if a WRITE returns
an error, then data->res.verf->committed is not tested (as it is not
initialised).

Then commit 60fa3f769f7651a60125a0f44e3ffe3246d7cf39 ("NFS: Fix two bugs
in the O_DIRECT write code") inadvertently reverted this while fixing
other problems.

So move the test so that we never examine ->committed in an error case,
and fix a speeling error while we are there.

Cc: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Neil Brown <neilb@suse.de>
Acked-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/nfs/direct.c