summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Moyer <jmoyer@redhat.com>2012-03-05 10:19:52 -0500
committerTheodore Ts'o <tytso@mit.edu>2012-03-05 10:19:52 -0500
commit93ef8541d5c3ad1a73057ff358a49d0ee7146d6f (patch)
tree70c2a7cac370084edac29ee0156f52d488ee32ab
parentf70486055ee351158bd6999f3965ad378b52c694 (diff)
downloadlinux-3.10-93ef8541d5c3ad1a73057ff358a49d0ee7146d6f.tar.gz
linux-3.10-93ef8541d5c3ad1a73057ff358a49d0ee7146d6f.tar.bz2
linux-3.10-93ef8541d5c3ad1a73057ff358a49d0ee7146d6f.zip
ext4: clean up the flags passed to __blockdev_direct_IO
For extent-based files, you can perform DIO to holes, as mentioned in the comments in ext4_ext_direct_IO. However, that function passes DIO_SKIP_HOLES to __blockdev_direct_IO, which is *really* confusing to the uninitiated reader. The key, here, is that the get_block function passed in, ext4_get_block_write, completely ignores the create flag that is passed to it (the create flag is passed in from the direct I/O code, which uses the DIO_SKIP_HOLES flag to determine whether or not it should be cleared). This is a long-winded way of saying that the DIO_SKIP_HOLES flag is ultimately ignored. So let's remove it. Signed-off-by: Jeff Moyer <jmoyer@redhat.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
-rw-r--r--fs/ext4/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 38dc5f3e9dd..5f8081c3803 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -2941,7 +2941,7 @@ static ssize_t ext4_ext_direct_IO(int rw, struct kiocb *iocb,
ext4_get_block_write,
ext4_end_io_dio,
NULL,
- DIO_LOCKING | DIO_SKIP_HOLES);
+ DIO_LOCKING);
if (iocb->private)
EXT4_I(inode)->cur_aio_dio = NULL;
/*