fix the regression from "direct-io: Fix negative return from dio read beyond eof"

Orabug: stable_rc4

commit 2d4594acbf6d8f75a27f3578476b6a27d8b13ebb upstream.

Sure, it's better to bail out of past-the-eof read and return 0 than return
a bogus negative value on such.  Only we'd better make sure we are bailing out
with 0 and not -ENOMEM...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 57b7d61c2d89e3e0665b9cdcc8fb73b08d10f0c2)

Signed-off-by: Dan Duval <dan.duval@oracle.com>

diff --git a/fs/direct-io.c b/fs/direct-io.c
index 6bc4bacd89843895678b0bfdfd09ea74fd7c55c3..d83a021a659fdaaa9741ac082624ea275b0217dc 100644 (file)
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -1165,6 +1165,7 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
                if (dio->flags & DIO_LOCKING)
                        mutex_unlock(&inode->i_mutex);
                kmem_cache_free(dio_cache, dio);
+               retval = 0;
                goto out;
        }