From mboxrd@z Thu Jan 1 00:00:00 1970 From: npiggin@suse.de Subject: [2.6.27.stable][patch 4/6] GFS2: Fix page_mkwrite() return code Date: Tue, 12 May 2009 16:23:50 +1000 Message-ID: <20090512070750.090713470@suse.de> References: <20090512062346.554974013@suse.de> Cc: linux-fsdevel@vger.kernel.org, linux-mm@vger.kernel.org To: stable@kernel.org Return-path: Received: from cantor2.suse.de ([195.135.220.15]:59786 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757248AbZELHRW (ORCPT ); Tue, 12 May 2009 03:17:22 -0400 Content-Disposition: inline; filename=e56985da455b9dc0591b8cb2006cc94b6f4fb0f4 Sender: linux-fsdevel-owner@vger.kernel.org List-ID: 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 --- 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; }