Commit 1e8a81c5 authored by Hifumi Hisashi's avatar Hifumi Hisashi Committed by Linus Torvalds

[PATCH] Fix the error handling in direct I/O

Fix a bug on error handling in the direct I/O function.

Currently, if a file is opened with the O_DIRECT|O_SYNC flag, the write()
syscall cannot receive the EIO error after an I/O error (SCSI cable is
disconnected etc.).

Return values of other points that call generic_osync_inode() are treated
appropriately.
Signed-off-by: default avatarHisashi Hifumi  <hifumi.hisashi@lab.ntt.co.jp>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b4819b59
...@@ -1851,8 +1851,11 @@ generic_file_direct_write(struct kiocb *iocb, const struct iovec *iov, ...@@ -1851,8 +1851,11 @@ generic_file_direct_write(struct kiocb *iocb, const struct iovec *iov,
* i_sem is held, which protects generic_osync_inode() from * i_sem is held, which protects generic_osync_inode() from
* livelocking. * livelocking.
*/ */
if (written >= 0 && file->f_flags & O_SYNC) if (written >= 0 && ((file->f_flags & O_SYNC) || IS_SYNC(inode))) {
generic_osync_inode(inode, mapping, OSYNC_METADATA); int err = generic_osync_inode(inode, mapping, OSYNC_METADATA);
if (err < 0)
written = err;
}
if (written == count && !is_sync_kiocb(iocb)) if (written == count && !is_sync_kiocb(iocb))
written = -EIOCBQUEUED; written = -EIOCBQUEUED;
return written; return written;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment