From patchwork Mon Jun 29 18:39:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaegeuk Kim X-Patchwork-Id: 6691251 Return-Path: X-Original-To: patchwork-linux-fsdevel@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 ABC59C05AC for ; Mon, 29 Jun 2015 18:41:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D2384205B5 for ; Mon, 29 Jun 2015 18:41:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C479020498 for ; Mon, 29 Jun 2015 18:41:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753477AbbF2SkV (ORCPT ); Mon, 29 Jun 2015 14:40:21 -0400 Received: from mail.kernel.org ([198.145.29.136]:38672 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752102AbbF2SkQ (ORCPT ); Mon, 29 Jun 2015 14:40:16 -0400 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 25EBE205BC; Mon, 29 Jun 2015 18:40:15 +0000 (UTC) Received: from localhost (unknown [166.170.37.87]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4BB8A205B9; Mon, 29 Jun 2015 18:40:14 +0000 (UTC) From: Jaegeuk Kim To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net Cc: Jaegeuk Kim Subject: [PATCH 07/12] f2fs: set cached_en after checking finally Date: Mon, 29 Jun 2015 11:39:31 -0700 Message-Id: <1435603176-63219-7-git-send-email-jaegeuk@kernel.org> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1435603176-63219-1-git-send-email-jaegeuk@kernel.org> References: <1435603176-63219-1-git-send-email-jaegeuk@kernel.org> X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch relocates cached_en not only to be covered by spin_lock, but also to set once after checking out completely. Signed-off-by: Jaegeuk Kim Reviewed-by: Chao Yu --- fs/f2fs/data.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 1e6609b..676e7b9 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -453,14 +453,12 @@ static struct extent_node *__lookup_extent_tree(struct extent_tree *et, while (node) { en = rb_entry(node, struct extent_node, rb_node); - if (fofs < en->ei.fofs) { + if (fofs < en->ei.fofs) node = node->rb_left; - } else if (fofs >= en->ei.fofs + en->ei.len) { + else if (fofs >= en->ei.fofs + en->ei.len) node = node->rb_right; - } else { - et->cached_en = en; + else return en; - } } return NULL; } @@ -625,6 +623,7 @@ static bool f2fs_lookup_extent_tree(struct inode *inode, pgoff_t pgofs, spin_lock(&sbi->extent_lock); if (!list_empty(&en->list)) list_move_tail(&en->list, &sbi->extent_list); + et->cached_en = en; spin_unlock(&sbi->extent_lock); stat_inc_read_hit(sbi->sb); }