Commit 57b7d61c authored by Al Viro's avatar Al Viro Committed by Greg Kroah-Hartman

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

commit 2d4594ac 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: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8885e7f3
...@@ -1165,6 +1165,7 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode, ...@@ -1165,6 +1165,7 @@ do_blockdev_direct_IO(struct kiocb *iocb, struct inode *inode,
if (dio->flags & DIO_LOCKING) if (dio->flags & DIO_LOCKING)
mutex_unlock(&inode->i_mutex); mutex_unlock(&inode->i_mutex);
kmem_cache_free(dio_cache, dio); kmem_cache_free(dio_cache, dio);
retval = 0;
goto out; goto out;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment