diff options
| author | NeilBrown <neilb@suse.de> | 2012-08-01 06:40:02 -0400 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2012-08-01 06:40:02 -0400 |
| commit | bb181e2e48f8c85db08c9cb015cbba9618dbf05c (patch) | |
| tree | 191bc24dd97bcb174535cc217af082f16da3b43d /fs/direct-io.c | |
| parent | d57368afe63b3b7b45ce6c2b8c5276417935be2f (diff) | |
| parent | c039c332f23e794deb6d6f37b9f07ff3b27fb2cf (diff) | |
Merge commit 'c039c332f23e794deb6d6f37b9f07ff3b27fb2cf' into md
Pull in pre-requisites for adding raid10 support to dm-raid.
Diffstat (limited to 'fs/direct-io.c')
| -rw-r--r-- | fs/direct-io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/direct-io.c b/fs/direct-io.c index 0c85fae37666..1faf4cb56f39 100644 --- a/fs/direct-io.c +++ b/fs/direct-io.c | |||
| @@ -1258,7 +1258,7 @@ do_blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode, | |||
| 1258 | */ | 1258 | */ |
| 1259 | BUG_ON(retval == -EIOCBQUEUED); | 1259 | BUG_ON(retval == -EIOCBQUEUED); |
| 1260 | if (dio->is_async && retval == 0 && dio->result && | 1260 | if (dio->is_async && retval == 0 && dio->result && |
| 1261 | ((rw & READ) || (dio->result == sdio.size))) | 1261 | ((rw == READ) || (dio->result == sdio.size))) |
| 1262 | retval = -EIOCBQUEUED; | 1262 | retval = -EIOCBQUEUED; |
| 1263 | 1263 | ||
| 1264 | if (retval != -EIOCBQUEUED) | 1264 | if (retval != -EIOCBQUEUED) |