diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 06:20:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 06:20:23 -0400 |
| commit | cd569ef5d6ff9f43e9504f1ffc7fdbe356518149 (patch) | |
| tree | 9a4ab5e600fd09e991aa1fbb69adb1c7950898a4 /fs/ocfs2/file.c | |
| parent | 6879827f4e08da219c99b91e4e1d793a924103e3 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'fs/ocfs2/file.c')
| -rw-r--r-- | fs/ocfs2/file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 57e0d30cde98..e8514e8b6ce8 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c | |||
| @@ -2202,7 +2202,7 @@ static ssize_t ocfs2_file_aio_read(struct kiocb *iocb, | |||
| 2202 | 2202 | ||
| 2203 | ret = generic_file_aio_read(iocb, iov, nr_segs, iocb->ki_pos); | 2203 | ret = generic_file_aio_read(iocb, iov, nr_segs, iocb->ki_pos); |
| 2204 | if (ret == -EINVAL) | 2204 | if (ret == -EINVAL) |
| 2205 | mlog(ML_ERROR, "generic_file_aio_read returned -EINVAL\n"); | 2205 | mlog(0, "generic_file_aio_read returned -EINVAL\n"); |
| 2206 | 2206 | ||
| 2207 | /* buffered aio wouldn't have proper lock coverage today */ | 2207 | /* buffered aio wouldn't have proper lock coverage today */ |
| 2208 | BUG_ON(ret == -EIOCBQUEUED && !(filp->f_flags & O_DIRECT)); | 2208 | BUG_ON(ret == -EIOCBQUEUED && !(filp->f_flags & O_DIRECT)); |