summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2009-05-12 16:23:50 +1000
committerGreg Kroah-Hartman <gregkh@suse.de>2009-05-19 22:20:10 -0700
commitb413c3438b84245825d03aeb80ecd9bae3af73a6 (patch)
treef0e4ff3e7ad32cd29943175db6cb4b86d589b0e7 /fs
parent392cc66802e9dece47dd4a9ef241014dc2182c6b (diff)
GFS2: Fix page_mkwrite() return code
commit e56985da455b9dc0591b8cb2006cc94b6f4fb0f4 upstream 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> Cc: Nick Piggin <npiggin@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs')
-rw-r--r--fs/gfs2/ops_file.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/gfs2/ops_file.c b/fs/gfs2/ops_file.c
index 227132473a39..641c43bad739 100644
--- a/fs/gfs2/ops_file.c
+++ b/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;
}