From patchwork Fri Feb 27 23:49:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daeseok Youn X-Patchwork-Id: 5904161 Return-Path: X-Original-To: patchwork-ocfs2-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A5E7DBF440 for ; Fri, 27 Feb 2015 23:52:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E539020306 for ; Fri, 27 Feb 2015 23:52:58 +0000 (UTC) Received: from userp1040.oracle.com (userp1040.oracle.com [156.151.31.81]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 03F83202A1 for ; Fri, 27 Feb 2015 23:52:57 +0000 (UTC) Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t1RNqlm6010713 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 27 Feb 2015 23:52:48 GMT Received: from oss.oracle.com (oss-old-reserved.oracle.com [137.254.22.2]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id t1RNqiER024042 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 27 Feb 2015 23:52:45 GMT Received: from localhost ([127.0.0.1] helo=oss-external-new.us.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1YRUi4-0003OM-LJ; Fri, 27 Feb 2015 15:52:44 -0800 Received: from aserv0022.oracle.com ([141.146.126.234]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1YRUi2-0003Np-WB for ocfs2-devel@oss.oracle.com; Fri, 27 Feb 2015 15:52:43 -0800 Received: from aserp1060.oracle.com (aserp1060.oracle.com [141.146.126.71]) by aserv0022.oracle.com (8.13.8/8.13.8) with ESMTP id t1RNqgsp001104 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 27 Feb 2015 23:52:42 GMT Received: from userp2040.oracle.com (userp2040.oracle.com [156.151.31.90]) by aserp1060.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t1RNqgIw017479 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Fri, 27 Feb 2015 23:52:42 GMT Authentication-Results: aserp1060.oracle.com; dkim=pass reason="2048-bit key" header.d=gmail.com header.i=@gmail.com header.b=rbxe5kUF Received: from pps.filterd (userp2040.oracle.com [127.0.0.1]) by userp2040.oracle.com (8.14.7/8.14.7) with SMTP id t1RNqe3S007763 for ; Fri, 27 Feb 2015 23:52:42 GMT Received: from mail-pa0-f43.google.com (mail-pa0-f43.google.com [209.85.220.43]) by userp2040.oracle.com with ESMTP id 1styudrdfc-1 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=NOT) for ; Fri, 27 Feb 2015 23:52:42 +0000 Received: by padbj1 with SMTP id bj1so746205pad.11 for ; Fri, 27 Feb 2015 15:52:41 -0800 (PST) X-Received: by 10.66.142.228 with SMTP id rz4mr28587832pab.86.1425081161247; Fri, 27 Feb 2015 15:52:41 -0800 (PST) Received: from devel.8.8.4.4 ([220.149.250.136]) by mx.google.com with ESMTPSA id z1sm5007075pdp.52.2015.02.27.15.52.38 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 27 Feb 2015 15:52:40 -0800 (PST) Date: Sat, 28 Feb 2015 08:49:58 +0900 From: Daeseok Youn To: mfasheh@suse.com, akpm@linux-foundation.org Message-ID: <20150227234958.GA12945@devel.8.8.4.4> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-12-10) X-ServerName: mail-pa0-f43.google.com X-Proofpoint-Virus-Version: vendor=nai engine=5700 definitions=7725 signatures=670628 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=7.0.1-1402240000 definitions=main-1502270252 Cc: ocfs2-devel@oss.oracle.com, linux-kernel@vger.kernel.org Subject: [Ocfs2-devel] [PATCH 2/4 RESEND] ocfs2: remove extra mlog_errno() call in __ocfs2_add_entry() X-BeenThere: ocfs2-devel@oss.oracle.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ocfs2-devel-bounces@oss.oracle.com Errors-To: ocfs2-devel-bounces@oss.oracle.com X-Source-IP: acsinet21.oracle.com [141.146.126.237] X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,RCVD_IN_DNSWL_MED,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Daeseok Youn --- RESEND: this patch is rebased by 1/4 fs/ocfs2/dir.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c index 1478a50..c1ab24f 100644 --- a/fs/ocfs2/dir.c +++ b/fs/ocfs2/dir.c @@ -1689,10 +1689,8 @@ int __ocfs2_add_entry(handle_t *handle, if (ocfs2_dirent_would_fit(de, rec_len)) { dir->i_mtime = dir->i_ctime = CURRENT_TIME; retval = ocfs2_mark_inode_dirty(handle, dir, parent_fe_bh); - if (retval < 0) { - mlog_errno(retval); + if (retval < 0) goto bail; - } if (insert_bh == parent_fe_bh) retval = ocfs2_journal_access_di(handle, @@ -1709,10 +1707,8 @@ int __ocfs2_add_entry(handle_t *handle, retval = ocfs2_dx_dir_insert(dir, handle, lookup); - if (retval) { - mlog_errno(retval); + if (retval) goto bail; - } } }