From patchwork Tue Sep 18 15:53:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anatol Pomozov X-Patchwork-Id: 184755 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 14C592C0086 for ; Wed, 19 Sep 2012 01:53:18 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757343Ab2IRPxQ (ORCPT ); Tue, 18 Sep 2012 11:53:16 -0400 Received: from mail-vb0-f74.google.com ([209.85.212.74]:65226 "EHLO mail-vb0-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757332Ab2IRPxP (ORCPT ); Tue, 18 Sep 2012 11:53:15 -0400 Received: by vbis24 with SMTP id s24so843274vbi.1 for ; Tue, 18 Sep 2012 08:53:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=AA9x6uA0HCZjc0PdyTSfpATfG1kcbbh0i+m+Bwl4oF4=; b=O6dy/O0mByHAXSEd4+swEH2jPtGChRpdxbW/CwG+ImCI4biQrNNO/SzLs5pbkJehnb 9P6xeYuZ1E9L00cJsq97wRgdhR2FEr9XFT6mkAIL/axPC0ltRWZJzG4ffHNBUeWnAEgR A5QNUUtPKMdAHEi30+T4TpNuXRuPOrr49k4UiYEuYcKUI9zJf5Ydr0U0KrTKxCLNWjd4 N6lW3yUWBdkVC0aWydMFCq/4MpeBfelJKGrSmXW2NhtZas/GHfQNheVHKT0Rd/kg6c3z fJaYtDy/EPJ6JVbncMZGJe76nptNz6RM00kuMpqNXsWeZeX/mQWFEDnm9UAm+wJSdKzr Jupg== Received: by 10.236.133.146 with SMTP id q18mr192621yhi.12.1347983594045; Tue, 18 Sep 2012 08:53:14 -0700 (PDT) Received: by 10.236.133.146 with SMTP id q18mr192614yhi.12.1347983593999; Tue, 18 Sep 2012 08:53:13 -0700 (PDT) Received: from wpzn3.hot.corp.google.com (216-239-44-65.google.com [216.239.44.65]) by gmr-mx.google.com with ESMTPS id o6si2824389yhn.7.2012.09.18.08.53.13 (version=TLSv1/SSLv3 cipher=AES128-SHA); Tue, 18 Sep 2012 08:53:13 -0700 (PDT) Received: from anatol.mtv.corp.google.com (anatol.mtv.corp.google.com [172.18.96.41]) by wpzn3.hot.corp.google.com (Postfix) with ESMTP id D0D84100047; Tue, 18 Sep 2012 08:53:13 -0700 (PDT) Received: by anatol.mtv.corp.google.com (Postfix, from userid 67983) id 6E19F16040A; Tue, 18 Sep 2012 08:53:13 -0700 (PDT) From: Anatol Pomozov To: tytso@mit.edu, linux-ext4@vger.kernel.org Cc: Anatol Pomozov Subject: [PATCH] Make orphan functions no-op in no-journal mode Date: Tue, 18 Sep 2012 08:53:05 -0700 Message-Id: <1347983585-22940-1-git-send-email-anatol.pomozov@gmail.com> X-Mailer: git-send-email 1.7.12 In-Reply-To: <1347904037-24229-1-git-send-email-anatol.pomozov@gmail.com> References: <1347904037-24229-1-git-send-email-anatol.pomozov@gmail.com> X-Gm-Message-State: ALoCoQks647efE7bRziUOCu+SquRc6YFUVVAfGKgbWAE1JQ9pgwPVqotUB8FkjmqrNzV37dbkcKjyMNCfRIr/A5QZCvFt09ojMgiQHNGRiie38eYBTBiZS5W8pi0maziD+L/Z+UPCAq9ptDvcxtUX4VPYZwXYvLUQq0Wu2TmubB62ycepckhXpxERzGX8EWx5vzDzxWjYZ9c6e/FklWsibAg+SwGLdDGzw== Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org Instead of checking whether the handle is valid, we check if journal is enabled. This avoids using shared mutext usage in all cases when ext4_orphan_del(NULL,..) is called in no-journal mode (i.e. in error path). Signed-off-by: Anatol Pomozov --- fs/ext4/namei.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 2a42cc0..341ab7e 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -2362,7 +2362,7 @@ int ext4_orphan_add(handle_t *handle, struct inode *inode) struct ext4_iloc iloc; int err = 0, rc; - if (!ext4_handle_valid(handle)) + if (!EXT4_SB(sb)->s_journal) return 0; mutex_lock(&EXT4_SB(sb)->s_orphan_lock); @@ -2436,8 +2436,7 @@ int ext4_orphan_del(handle_t *handle, struct inode *inode) struct ext4_iloc iloc; int err = 0; - /* ext4_handle_valid() assumes a valid handle_t pointer */ - if (handle && !ext4_handle_valid(handle)) + if (!EXT4_SB(inode->i_sb)->s_journal) return 0; mutex_lock(&EXT4_SB(inode->i_sb)->s_orphan_lock); @@ -2456,7 +2455,7 @@ int ext4_orphan_del(handle_t *handle, struct inode *inode) * transaction handle with which to update the orphan list on * disk, but we still need to remove the inode from the linked * list in memory. */ - if (sbi->s_journal && !handle) + if (!handle) goto out; err = ext4_reserve_inode_write(handle, inode, &iloc);