From patchwork Tue Jun 21 08:49:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liubo X-Patchwork-Id: 900462 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5L8oXlO018295 for ; Tue, 21 Jun 2011 08:50:34 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753008Ab1FUIuK (ORCPT ); Tue, 21 Jun 2011 04:50:10 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:54102 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752727Ab1FUIuH (ORCPT ); Tue, 21 Jun 2011 04:50:07 -0400 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 7AF3C170137; Tue, 21 Jun 2011 16:50:05 +0800 (CST) Received: from mailserver.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id p5L8o4PH019626; Tue, 21 Jun 2011 16:50:04 +0800 Received: from localhost.localdomain ([10.167.225.27]) by mailserver.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.1FP4) with ESMTP id 2011062116494121-627579 ; Tue, 21 Jun 2011 16:49:41 +0800 From: Liu Bo To: Cc: , , Subject: [PATCH 02/12 v3] Btrfs: update block generation if should_cow_block fails Date: Tue, 21 Jun 2011 16:49:43 +0800 Message-Id: <1308646193-7086-3-git-send-email-liubo2009@cn.fujitsu.com> X-Mailer: git-send-email 1.6.5.2 In-Reply-To: <1308646193-7086-1-git-send-email-liubo2009@cn.fujitsu.com> References: <1308646193-7086-1-git-send-email-liubo2009@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-06-21 16:49:41, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2011-06-21 16:49:42, Serialize complete at 2011-06-21 16:49:42 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 21 Jun 2011 08:50:34 +0000 (UTC) Cause we've added sub transaction, if it do not want to cow a block, we also need to get new sub transid recorded. This is used for log code to find the most uptodate file extents. Signed-off-by: Liu Bo --- fs/btrfs/ctree.c | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-) diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index f35b517..cfddb05 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c @@ -477,6 +477,33 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans, return 0; } +static inline void update_block_generation(struct btrfs_trans_handle *trans, + struct btrfs_root *root, + struct extent_buffer *buf, + struct extent_buffer *parent, + int slot) +{ + /* + * If it does not need to cow this block, we still need to + * update the block's generation, for transid may have been + * changed during fsync. + */ + if (btrfs_header_generation(buf) == trans->transid) + return; + + if (buf == root->node) { + btrfs_set_header_generation(buf, trans->transid); + btrfs_mark_buffer_dirty(buf); + add_root_to_dirty_list(root); + } else { + btrfs_set_node_ptr_generation(parent, slot, + trans->transid); + btrfs_set_header_generation(buf, trans->transid); + btrfs_mark_buffer_dirty(parent); + btrfs_mark_buffer_dirty(buf); + } +} + static inline int should_cow_block(struct btrfs_trans_handle *trans, struct btrfs_root *root, struct extent_buffer *buf) @@ -517,6 +544,7 @@ noinline int btrfs_cow_block(struct btrfs_trans_handle *trans, } if (!should_cow_block(trans, root, buf)) { + update_block_generation(trans, root, buf, parent, parent_slot); *cow_ret = buf; return 0; } @@ -1655,8 +1683,12 @@ again: * then we don't want to set the path blocking, * so we test it here */ - if (!should_cow_block(trans, root, b)) + if (!should_cow_block(trans, root, b)) { + update_block_generation(trans, root, b, + p->nodes[level + 1], + p->slots[level + 1]); goto cow_done; + } btrfs_set_path_blocking(p);