• Trond Myklebust's avatar
    Revert "NFS: Ensure we return zero if applications attempt to write zero bytes" · a5576cfa
    Trond Myklebust authored
    This reverts commit b9148c6b.
    
    On Wed, 12 Dec 2007 10:57:30 -0500, Chuck Lever wrote
    > commit b9148c6b should be reverted.  It was recently forward-ported
    > from some years-old patches, and is clearly not needed now.
    >
    > On Dec 11, 2007, at 5:21 PM, Adrian Bunk wrote:
    >
    >> This code became dead after commit
    >> b9148c6b
    >> (which BTW doesn't seem to have changed any behaviour) and can
    >> therefore
    >> be removed.
    >>
    >> Spotted by the Coverity checker.
    >>
    >> Signed-off-by: Adrian Bunk <bunk@kernel.org>
    >>
    >> ---
    >> --- linux-2.6/fs/nfs/direct.c.old     2007-12-02 21:54:53.000000000 +0100
    >> +++ linux-2.6/fs/nfs/direct.c 2007-12-02 21:55:10.000000000 +0100
    >> @@ -897,15 +897,12 @@ ssize_t nfs_file_direct_write(struct kio
    >>       if (!count)
    >>               goto out;       /* return 0 */
    >>
    >>       retval = -EINVAL;
    >>       if ((ssize_t) count < 0)
    >>               goto out;
    >> -     retval = 0;
    >> -     if (!count)
    >> -             goto out;
    >>
    >>       retval = nfs_sync_mapping(mapping);
    >>       if (retval)
    >>               goto out;
    >>
    >>       retval = nfs_direct_write(iocb, iov, nr_segs, pos, count);
    >>
    Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
    a5576cfa
direct.c 25.3 KB