---

yaml --- r: 143788 b: refs/heads/master c: e56985d h: refs/heads/master v: v3
git-mirror · Apr 20, 2009 · d4c8c8f · d4c8c8f
1 parent 787d86e
commit d4c8c8f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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;
 }