Commit 08554955 authored by Darrick J. Wong's avatar Darrick J. Wong

ocfs2: don't eat io errors during _dio_end_io_write

ocfs2_dio_end_io_write eats whatever errors may happen,
which means that write errors do not propagate to userspace.
Fix that.
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 3e10b793
...@@ -2263,10 +2263,10 @@ static int ocfs2_dio_get_block(struct inode *inode, sector_t iblock, ...@@ -2263,10 +2263,10 @@ static int ocfs2_dio_get_block(struct inode *inode, sector_t iblock,
return ret; return ret;
} }
static void ocfs2_dio_end_io_write(struct inode *inode, static int ocfs2_dio_end_io_write(struct inode *inode,
struct ocfs2_dio_write_ctxt *dwc, struct ocfs2_dio_write_ctxt *dwc,
loff_t offset, loff_t offset,
ssize_t bytes) ssize_t bytes)
{ {
struct ocfs2_cached_dealloc_ctxt dealloc; struct ocfs2_cached_dealloc_ctxt dealloc;
struct ocfs2_extent_tree et; struct ocfs2_extent_tree et;
...@@ -2374,6 +2374,8 @@ static void ocfs2_dio_end_io_write(struct inode *inode, ...@@ -2374,6 +2374,8 @@ static void ocfs2_dio_end_io_write(struct inode *inode,
if (locked) if (locked)
inode_unlock(inode); inode_unlock(inode);
ocfs2_dio_free_write_ctx(inode, dwc); ocfs2_dio_free_write_ctx(inode, dwc);
return ret;
} }
/* /*
...@@ -2388,6 +2390,7 @@ static int ocfs2_dio_end_io(struct kiocb *iocb, ...@@ -2388,6 +2390,7 @@ static int ocfs2_dio_end_io(struct kiocb *iocb,
{ {
struct inode *inode = file_inode(iocb->ki_filp); struct inode *inode = file_inode(iocb->ki_filp);
int level; int level;
int ret = 0;
if (bytes <= 0) if (bytes <= 0)
return 0; return 0;
...@@ -2396,13 +2399,13 @@ static int ocfs2_dio_end_io(struct kiocb *iocb, ...@@ -2396,13 +2399,13 @@ static int ocfs2_dio_end_io(struct kiocb *iocb,
BUG_ON(!ocfs2_iocb_is_rw_locked(iocb)); BUG_ON(!ocfs2_iocb_is_rw_locked(iocb));
if (private) if (private)
ocfs2_dio_end_io_write(inode, private, offset, bytes); ret = ocfs2_dio_end_io_write(inode, private, offset, bytes);
ocfs2_iocb_clear_rw_locked(iocb); ocfs2_iocb_clear_rw_locked(iocb);
level = ocfs2_iocb_rw_locked_level(iocb); level = ocfs2_iocb_rw_locked_level(iocb);
ocfs2_rw_unlock(inode, level); ocfs2_rw_unlock(inode, level);
return 0; return ret;
} }
static ssize_t ocfs2_direct_IO(struct kiocb *iocb, struct iov_iter *iter) static ssize_t ocfs2_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
......
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