aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2009-04-20 09:45:54 +0100
committerSteven Whitehouse <swhiteho@redhat.com>2009-04-20 16:02:02 +0100
commite56985da455b9dc0591b8cb2006cc94b6f4fb0f4 (patch)
tree0ae2bf7a5001fbf9fdc9dc027c03e63670303b85 /fs/gfs2
parent52fcd11c0900b0cbc584eeda12a6e27dd6c9d046 (diff)
downloadkernel_samsung_aries-e56985da455b9dc0591b8cb2006cc94b6f4fb0f4.zip
kernel_samsung_aries-e56985da455b9dc0591b8cb2006cc94b6f4fb0f4.tar.gz
kernel_samsung_aries-e56985da455b9dc0591b8cb2006cc94b6f4fb0f4.tar.bz2
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>
Diffstat (limited to 'fs/gfs2')
-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 101caf3..5d82e91 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;
}