Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932544AbbB0Xxo (ORCPT ); Fri, 27 Feb 2015 18:53:44 -0500 Received: from mail-pa0-f52.google.com ([209.85.220.52]:36821 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932083AbbB0Xxm (ORCPT ); Fri, 27 Feb 2015 18:53:42 -0500 Date: Sat, 28 Feb 2015 08:51:00 +0900 From: Daeseok Youn To: mfasheh@suse.com, akpm@linux-foundation.org Cc: jlbec@evilplan.org, ocfs2-devel@oss.oracle.com, linux-kernel@vger.kernel.org, richard.weinberger@gmail.com Subject: [PATCH 3/4 RESEND] ocfs2: need to handle error for ocfs2_journal_access_di() call Message-ID: <20150227235100.GA12964@devel.8.8.4.4> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-12-10) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1207 Lines: 43 There is no error handle when ocfs2_journal_access_di() is failed. And also it doesn't need to call ocfs2_dx_dir_insert() when ocfs2_journal_access_db() is failed. Signed-off-by: Daeseok Youn --- RESEND: this patch rebased by 1/4 fs/ocfs2/dir.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c index c1ab24f..c63f2b6 100644 --- a/fs/ocfs2/dir.c +++ b/fs/ocfs2/dir.c @@ -1703,15 +1703,15 @@ int __ocfs2_add_entry(handle_t *handle, insert_bh, OCFS2_JOURNAL_ACCESS_WRITE); - if (ocfs2_dir_indexed(dir)) { + if (!retval && ocfs2_dir_indexed(dir)) retval = ocfs2_dx_dir_insert(dir, handle, lookup); - if (retval) - goto bail; - } } + if (retval) + goto bail; + /* By now the buffer is marked for journaling */ offset += le16_to_cpu(de->rec_len); if (le64_to_cpu(de->inode)) { -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/