From: Steven Whitehouse <swhiteho@redhat.com>
Date: Mon, 20 Apr 2009 08:45:54 +0000 (+0100)
Subject: GFS2: Fix page_mkwrite() return code
X-Git-Tag: v2.6.30-rc3~33^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e56985da455b9dc0591b8cb2006cc94b6f4fb0f4;p=thirdparty%2Fkernel%2Flinux.git

GFS2: Fix page_mkwrite() return code

This allows for the possibility of returning VM_FAULT_OOM as
well as VM_FAULT_SIGBUS. This ensures that the correct action
is taken.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
---

diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c
index 101caf3ee8618..5d82e91887e31 100644
--- a/fs/gfs2/ops_file.c
+++ b/fs/gfs2/ops_file.c
@@ -413,7 +413,9 @@ out_unlock:
 	gfs2_glock_dq(&gh);
 out:
 	gfs2_holder_uninit(&gh);
-	if (ret)
+	if (ret == -ENOMEM)
+		ret = VM_FAULT_OOM;
+	else if (ret)
 		ret = VM_FAULT_SIGBUS;
 	return ret;
 }