[2.6.27.stable][patch 4/6] GFS2: Fix page_mkwrite() return code

[npiggin@suse.de]

[-- Attachment #1: e56985da455b9dc0591b8cb2006cc94b6f4fb0f4 --]
[-- Type: text/plain, Size: 720 bytes --]

    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>

---
 fs/gfs2/ops_file.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: linux-2.6/fs/gfs2/ops_file.c
===================================================================
--- linux-2.6.orig/fs/gfs2/ops_file.c
+++ linux-2.6/fs/gfs2/ops_file.c
@@ -412,7 +412,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;
 }