From: Jeff Moyer <jmoyer@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: akpm@osdl.org
Subject: [patch] fix O_DIRECT read of last block in a sparse file
Date: Mon, 23 Jan 2006 14:16:07 -0500 [thread overview]
Message-ID: <17365.11127.860256.702246@segfault.boston.redhat.com> (raw)
Hi,
Currently, if you open a file O_DIRECT, truncate it to a size that is not a
multiple of the disk block size, and then try to read the last block in the
file, the read will return 0. The problem is in do_direct_IO, here:
/* Handle holes */
if (!buffer_mapped(map_bh)) {
char *kaddr;
...
if (dio->block_in_file >=
i_size_read(dio->inode)>>blkbits) {
/* We hit eof */
page_cache_release(page);
goto out;
}
We shift off any remaining bytes in the final block of the I/O, resulting
in a 0-sized read. I've attached a patch that fixes this. I'm not happy
about how ugly the math is getting, so suggestions are more than welcome.
I've tested this with a simple program that performs the steps outlined for
reproducing the problem above. Without the patch, we get a 0-sized result
from read. With the patch, we get the correct return value from the short
read.
Thanks,
Jeff
Signed-off-by: Jeff Moyer <jmoyer@redhat.com>
--- linux-2.6.16-rc1-mm1/fs/direct-io.c.orig 2006-01-19 15:45:50.000000000 -0500
+++ linux-2.6.16-rc1-mm1/fs/direct-io.c 2006-01-19 16:09:33.000000000 -0500
@@ -857,6 +857,7 @@ do_holes:
/* Handle holes */
if (!buffer_mapped(map_bh)) {
char *kaddr;
+ loff_t i_size = i_size_read(dio->inode);
/* AKPM: eargh, -ENOTBLK is a hack */
if (dio->rw == WRITE) {
@@ -864,8 +865,10 @@ do_holes:
return -ENOTBLK;
}
- if (dio->block_in_file >=
- i_size_read(dio->inode)>>blkbits) {
+ /* Be sure to account for a partial block as
+ * the last block in the file */
+ if (dio->block_in_file >= i_size >> blkbits &&
+ !(i_size & ~((1<<blkbits)-1))) {
/* We hit eof */
page_cache_release(page);
goto out;
next reply other threads:[~2006-01-23 19:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-01-23 19:16 Jeff Moyer [this message]
2006-01-23 23:54 ` [patch] fix O_DIRECT read of last block in a sparse file Andrew Morton
2006-01-24 12:09 ` Jeff Moyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=17365.11127.860256.702246@segfault.boston.redhat.com \
--to=jmoyer@redhat.com \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).