From d4c8c8f7a1d56d92035bfe99eee2f48544bf8ab7 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Mon, 20 Apr 2009 09:45:54 +0100
Subject: [PATCH] --- yaml --- r: 143788 b: refs/heads/master c:
 e56985da455b9dc0591b8cb2006cc94b6f4fb0f4 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/fs/gfs2/ops_file.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 229dec2480ce..bd31111bf623 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 52fcd11c0900b0cbc584eeda12a6e27dd6c9d046
+refs/heads/master: e56985da455b9dc0591b8cb2006cc94b6f4fb0f4
diff --git a/trunk/fs/gfs2/ops_file.c b/trunk/fs/gfs2/ops_file.c
index 101caf3ee861..5d82e91887e3 100644
--- a/trunk/fs/gfs2/ops_file.c
+++ b/trunk/fs/gfs2/ops_file.c
@@ -413,7 +413,9 @@ static int gfs2_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
 	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;
 }