--- fs/nfs/direct.c

+++ fs/nfs/direct.c

@@ -401,15 +401,18 @@ static ssize_t nfs_direct_read_schedule_

pos += vec->iov_len;

}

+ /*

+ * If no bytes were started, return the error, and let the

+ * generic layer handle the completion.

+ */

+ if (requested_bytes == 0) {

+ nfs_direct_req_release(dreq);

+ return result < 0 ? result : -EIO;

+ }

+

if (put_dreq(dreq))

nfs_direct_complete(dreq);

-

- if (requested_bytes != 0)

- return 0;

-

- if (result < 0)

- return result;

- return -EIO;

+ return 0;

}

static ssize_t nfs_direct_read(struct kiocb *iocb, const struct iovec *iov,

@@ -829,15 +832,18 @@ static ssize_t nfs_direct_write_schedule

pos += vec->iov_len;

}

+ /*

+ * If no bytes were started, return the error, and let the

+ * generic layer handle the completion.

+ */

+ if (requested_bytes == 0) {

+ nfs_direct_req_release(dreq);

+ return result < 0 ? result : -EIO;

+ }

+

if (put_dreq(dreq))

nfs_direct_write_complete(dreq, dreq->inode);

-

- if (requested_bytes != 0)

- return 0;

-

- if (result < 0)

- return result;

- return -EIO;

+ return 0;

}

static ssize_t nfs_direct_write(struct kiocb *iocb, const struct iovec *iov,