← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to fs/direct-io.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
fs/direct-io.c
645
645
                /*
646
646
                 * See whether this new request is contiguous with the old.
647
647
                 *
648
 
                 * Btrfs cannot handl having logically non-contiguous requests
649
 
                 * submitted.  For exmple if you have
 
648
                 * Btrfs cannot handle having logically non-contiguous requests
 
649
                 * submitted.  For example if you have
650
650
                 *
651
651
                 * Logical:  [0-4095][HOLE][8192-12287]
652
 
                 * Phyiscal: [0-4095]      [4096-8181]
 
652
                 * Physical: [0-4095]      [4096-8191]
653
653
                 *
654
654
                 * We cannot submit those pages together as one BIO.  So if our
655
655
                 * current logical offset in the file does not equal what would
1110
1110
            ((rw & READ) || (dio->result == dio->size)))
1111
1111
                ret = -EIOCBQUEUED;
1112
1112
 
1113
 
        if (ret != -EIOCBQUEUED) {
1114
 
                /* All IO is now issued, send it on its way */
1115
 
                blk_run_address_space(inode->i_mapping);
 
1113
        if (ret != -EIOCBQUEUED)
1116
1114
                dio_await_completion(dio);
1117
 
        }
1118
1115
 
1119
1116
        /*
1120
1117
         * Sync will always be dropping the final ref and completing the
1176
1173
        struct dio *dio;
1177
1174
 
1178
1175
        if (rw & WRITE)
1179
 
                rw = WRITE_ODIRECT_PLUG;
 
1176
                rw = WRITE_ODIRECT;
1180
1177
 
1181
1178
        if (bdev)
1182
1179
                bdev_blkbits = blksize_bits(bdev_logical_block_size(bdev));