vserver 2.0 rc7

[linux-2.6.git] / fs / direct-io.c

diff --git a/fs/direct-io.c b/fs/direct-io.c
index 2832683..1d55e7e 100644 (file)
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -66,6 +66,7 @@ struct dio {
        struct bio *bio;                /* bio under assembly */
        struct inode *inode;
        int rw;
+       loff_t i_size;                  /* i_size when submitted */
        int lock_type;                  /* doesn't change */
        unsigned blkbits;               /* doesn't change */
        unsigned blkfactor;             /* When we're using an alignment which
@@ -230,17 +231,29 @@ static void finished_one_bio(struct dio *dio)
        spin_lock_irqsave(&dio->bio_lock, flags);
        if (dio->bio_count == 1) {
                if (dio->is_async) {
+                       ssize_t transferred;
+                       loff_t offset;
+
                        /*
                         * Last reference to the dio is going away.
                         * Drop spinlock and complete the DIO.
                         */
                        spin_unlock_irqrestore(&dio->bio_lock, flags);
-                       dio_complete(dio, dio->block_in_file << dio->blkbits,
-                                       dio->result);
+
+                       /* Check for short read case */
+                       transferred = dio->result;
+                       offset = dio->iocb->ki_pos;
+
+                       if ((dio->rw == READ) &&
+                           ((offset + transferred) > dio->i_size))
+                               transferred = dio->i_size - offset;
+
+                       dio_complete(dio, offset, transferred);
+
                        /* Complete AIO later if falling back to buffered i/o */
                        if (dio->result == dio->size ||
                                ((dio->rw == READ) && dio->result)) {
-                               aio_complete(dio->iocb, dio->result, 0);
+                               aio_complete(dio->iocb, transferred, 0);
                                kfree(dio);
                                return;
                        } else {
@@ -951,6 +964,7 @@ direct_io_worker(int rw, struct kiocb *iocb, struct inode *inode,
        dio->page_errors = 0;
        dio->result = 0;
        dio->iocb = iocb;
+       dio->i_size = i_size_read(inode);
 
        /*
         * BIO completion state.
@@ -1206,7 +1220,8 @@ __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
         */
        dio->lock_type = dio_lock_type;
        if (dio_lock_type != DIO_NO_LOCKING) {
-               if (rw == READ) {
+               /* watch out for a 0 len io from a tricksy fs */
+               if (rw == READ && end > offset) {
                        struct address_space *mapping;
 
                        mapping = iocb->ki_filp->f_mapping;
@@ -1214,7 +1229,9 @@ __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
                                down(&inode->i_sem);
                                reader_with_isem = 1;
                        }
-                       retval = filemap_write_and_wait(mapping);
+
+                       retval = filemap_write_and_wait_range(mapping, offset,
+                                                             end - 1);
                        if (retval) {
                                kfree(dio);
                                goto out;