Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 168422
b: refs/heads/master
c: 4b70df1
h: refs/heads/master
v: v3
  • Loading branch information
Mingming authored and Theodore Ts'o committed Nov 3, 2009
1 parent fd8e5ff commit e52a62b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5f5249507e4b5c4fc0f9c93f33d133d8c95f47e1
refs/heads/master: 4b70df181611012a3556f017b57dfcef7e1d279f
9 changes: 4 additions & 5 deletions trunk/fs/ext4/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -3446,8 +3446,6 @@ static ssize_t ext4_ind_direct_IO(int rw, struct kiocb *iocb,
return ret;
}

/* Maximum number of blocks we map for direct IO at once. */

static int ext4_get_block_dio_write(struct inode *inode, sector_t iblock,
struct buffer_head *bh_result, int create)
{
Expand Down Expand Up @@ -3655,13 +3653,14 @@ static void ext4_end_io_dio(struct kiocb *iocb, loff_t offset,
ext4_io_end_t *io_end = iocb->private;
struct workqueue_struct *wq;

/* if not async direct IO or dio with 0 bytes write, just return */
if (!io_end || !size)
return;

ext_debug("ext4_end_io_dio(): io_end 0x%p"
"for inode %lu, iocb 0x%p, offset %llu, size %llu\n",
iocb->private, io_end->inode->i_ino, iocb, offset,
size);
/* if not async direct IO or dio with 0 bytes write, just return */
if (!io_end || !size)
return;

/* if not aio dio with unwritten extents, just free io and return */
if (io_end->flag != DIO_AIO_UNWRITTEN){
Expand Down

0 comments on commit e52a62b

Please sign in to comment.