Return-Path: Received: from mx2.suse.de ([195.135.220.15]:37752 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752470AbcCJTSh (ORCPT ); Thu, 10 Mar 2016 14:18:37 -0500 From: Jan Kara To: linux-fsdevel@vger.kernel.org Cc: "Wilcox, Matthew R" , Ross Zwisler , Dan Williams , linux-nvdimm@lists.01.org, NeilBrown , Jan Kara Subject: [PATCH 04/12] ocfs2: Fix return value from ocfs2_page_mkwrite() Date: Thu, 10 Mar 2016 20:18:47 +0100 Message-Id: <1457637535-21633-5-git-send-email-jack@suse.cz> In-Reply-To: <1457637535-21633-1-git-send-email-jack@suse.cz> References: <1457637535-21633-1-git-send-email-jack@suse.cz> Sender: linux-fsdevel-owner@vger.kernel.org List-ID: ocfs2_page_mkwrite() could mistakenly return error code instead of mkwrite status value. Fix it. Signed-off-by: Jan Kara --- fs/ocfs2/mmap.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/ocfs2/mmap.c b/fs/ocfs2/mmap.c index 9581d190f6e1..77ebc2bc1cca 100644 --- a/fs/ocfs2/mmap.c +++ b/fs/ocfs2/mmap.c @@ -147,6 +147,10 @@ static int ocfs2_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) ret = ocfs2_inode_lock(inode, &di_bh, 1); if (ret < 0) { mlog_errno(ret); + if (ret == -ENOMEM) + ret = VM_FAULT_OOM; + else + ret = VM_FAULT_SIGBUS; goto out; } -- 2.6.2