From: Norton.Zhu <norton.zhu@huawei.com>
Date: Fri, 6 Nov 2015 02:43:52 +0000 (-0800)
Subject: ocfs2_direct_IO_write() misses ocfs2_is_overwrite() error code
X-Git-Tag: Ubuntu-5.0.0-8.9~8388^2~158
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=d162eaad7726e5f10a2b5813bdfac9d55c8eba69;p=mirror_ubuntu-disco-kernel.git

ocfs2_direct_IO_write() misses ocfs2_is_overwrite() error code

If ocfs2_is_overwrite failed, ocfs2_direct_IO_write mays till return
success to the caller.

Signed-off-by: Norton.Zhu <norton.zhu@huawei.com>
Cc: Mark Fasheh <mfasheh@suse.de>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index 64b11d90eca6..f04914cc19a4 100644
--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@ -864,6 +864,7 @@ static ssize_t ocfs2_direct_IO_write(struct kiocb *iocb,
 		is_overwrite = ocfs2_is_overwrite(osb, inode, offset);
 		if (is_overwrite < 0) {
 			mlog_errno(is_overwrite);
+			ret = is_overwrite;
 			ocfs2_inode_unlock(inode, 1);
 			goto clean_orphan;
 		}