diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-30 11:04:26 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-30 11:04:26 +1000 |
| commit | 58ad5bdc29da053d214d2b4c61d34cb56b9d7a0b (patch) | |
| tree | 03f910daf18780ac25e3a0dfd2d56caeb69004da /fs/xfs/linux-2.6/xfs_aops.c | |
| parent | d773fdd05f8f0566dcafb81a9f1b29d7687cb5ce (diff) | |
| parent | f613dfcb3345dacb8cf99b7bb359acc1c18a1157 (diff) | |
Merge remote branch 'ext4/next'
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_aops.c')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_aops.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c index 34640d6dbdcb..5895aaf62ace 100644 --- a/fs/xfs/linux-2.6/xfs_aops.c +++ b/fs/xfs/linux-2.6/xfs_aops.c @@ -1599,7 +1599,9 @@ xfs_end_io_direct( struct kiocb *iocb, loff_t offset, ssize_t size, - void *private) + void *private, + int ret, + bool is_async) { xfs_ioend_t *ioend = iocb->private; @@ -1645,6 +1647,9 @@ xfs_end_io_direct( * against double-freeing. */ iocb->private = NULL; + + if (is_async) + aio_complete(iocb, ret, 0); } STATIC ssize_t |