Merge branch 'for-linus' of git://git.kernel.dk/linux-block

[firefly-linux-kernel-4.4.55.git] / fs / dax.c

diff --git a/fs/dax.c b/fs/dax.c
index 131fd35ae39d53f8a9ef7bdd1aaa61677beda5f0..8e17b371aeb894620ac2cc5d7a7e2aaee7095310 100644 (file)
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -174,8 +174,10 @@ static ssize_t dax_io(struct inode *inode, struct iov_iter *iter,
                else
                        len = iov_iter_zero(max - pos, iter);
 
-               if (!len)
+               if (!len) {
+                       retval = -EFAULT;
                        break;
+               }
 
                pos += len;
                addr += len;