From patchwork Sat May 7 23:54:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allison Henderson X-Patchwork-Id: 94531 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id AF381B715A for ; Sun, 8 May 2011 09:54:35 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932072Ab1EGXye (ORCPT ); Sat, 7 May 2011 19:54:34 -0400 Received: from e4.ny.us.ibm.com ([32.97.182.144]:54609 "EHLO e4.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932066Ab1EGXye (ORCPT ); Sat, 7 May 2011 19:54:34 -0400 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by e4.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id p47NXuEZ009595 for ; Sat, 7 May 2011 19:33:57 -0400 Received: from d01av04.pok.ibm.com (d01av04.pok.ibm.com [9.56.224.64]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p47NsX99089342 for ; Sat, 7 May 2011 19:54:33 -0400 Received: from d01av04.pok.ibm.com (loopback [127.0.0.1]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p47NsXaJ021649 for ; Sat, 7 May 2011 19:54:33 -0400 Received: from [9.48.112.215] (sig-9-48-112-215.mts.ibm.com [9.48.112.215]) by d01av04.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p47NsWcg021309; Sat, 7 May 2011 19:54:33 -0400 Message-ID: <4DC5DBB3.9030207@linux.vnet.ibm.com> Date: Sat, 07 May 2011 16:54:27 -0700 From: Allison Henderson User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.17) Gecko/20110414 Thunderbird/3.1.10 MIME-Version: 1.0 To: Ext4 Developers List CC: Jan Kara Subject: [PATCH 1/1] Null Pointer when make_indexed_dir returns -ENOSPC Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Fix for a null pointer bug found while running punch hole tests Signed-off-by: Allison Henderson --- :100644 100644 3c7a06e... 3302a6c... M fs/ext4/namei.c fs/ext4/namei.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 3c7a06e..3302a6c 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1422,7 +1422,8 @@ static int make_indexed_dir(handle_t *handle, struct dentry *dentry, */ ext4_mark_inode_dirty(handle, dir); ext4_handle_dirty_metadata(handle, dir, frame->bh); - ext4_handle_dirty_metadata(handle, dir, bh); + if (bh) + ext4_handle_dirty_metadata(handle, dir, bh); dx_release(frames); return retval; }