diff --git a/[refs] b/[refs]
index d75a94d6c1cf..a0fb25ff13d3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c216fd708e1a97431925ecffd6d1896cff61df0a
+refs/heads/master: b9148c6b80d802dbc2a7530b29915a80432e50c7
diff --git a/trunk/fs/nfs/direct.c b/trunk/fs/nfs/direct.c
index 88d5d1c7f987..4d726e9db295 100644
--- a/trunk/fs/nfs/direct.c
+++ b/trunk/fs/nfs/direct.c
@@ -890,6 +890,8 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, const struct iovec *iov,
 	retval = generic_write_checks(file, &pos, &count, 0);
 	if (retval)
 		goto out;
+	if (!count)
+		goto out;	/* return 0 */
 
 	retval = -EINVAL;
 	if ((ssize_t) count < 0)