From patchwork Thu Jan 14 05:57:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 8029841 Return-Path: X-Original-To: patchwork-linux-btrfs@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 0FA80BEEE5 for ; Thu, 14 Jan 2016 06:01:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3466920439 for ; Thu, 14 Jan 2016 06:01:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 512DF2042C for ; Thu, 14 Jan 2016 06:01:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752053AbcANGAM (ORCPT ); Thu, 14 Jan 2016 01:00:12 -0500 Received: from cn.fujitsu.com ([59.151.112.132]:18653 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751962AbcANGAK (ORCPT ); Thu, 14 Jan 2016 01:00:10 -0500 X-IronPort-AV: E=Sophos;i="5.20,346,1444665600"; d="scan'208";a="2575591" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 14 Jan 2016 14:00:04 +0800 Received: from G08CNEXCHPEKD02.g08.fujitsu.local (unknown [10.167.33.83]) by cn.fujitsu.com (Postfix) with ESMTP id A7A9D41896DF for ; Thu, 14 Jan 2016 13:59:48 +0800 (CST) Received: from localhost.localdomain (10.167.226.34) by G08CNEXCHPEKD02.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.181.6; Thu, 14 Jan 2016 13:59:48 +0800 From: Qu Wenruo To: CC: Wang Xiaoguang Subject: [PATCH v4 18/18] btrfs: dedup: add per-file online dedup control Date: Thu, 14 Jan 2016 13:57:34 +0800 Message-ID: <1452751054-2365-19-git-send-email-quwenruo@cn.fujitsu.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1452751054-2365-1-git-send-email-quwenruo@cn.fujitsu.com> References: <1452751054-2365-1-git-send-email-quwenruo@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.34] X-yoursite-MailScanner-ID: A7A9D41896DF.A14C7 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: quwenruo@cn.fujitsu.com X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Wang Xiaoguang Introduce inode_need_dedup() to implement per-file online dedup control. Signed-off-by: Wang Xiaoguang --- fs/btrfs/inode.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 5a49afa..6d2f068 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -672,6 +672,21 @@ static void free_async_extent_pages(struct async_extent *async_extent) async_extent->pages = NULL; } +static inline int inode_need_dedup(struct inode *inode) +{ + struct btrfs_root *root = BTRFS_I(inode)->root; + struct btrfs_dedup_info *dedup_info = root->fs_info->dedup_info; + + if (!dedup_info) + return 0; + + if (BTRFS_I(inode)->flags & BTRFS_INODE_NODEDUP) + return 0; + + return 1; +} + + static int submit_dedup_extent(struct inode *inode, u64 start, unsigned long len, u64 disk_start, int dedup) { @@ -1794,8 +1809,6 @@ static int run_delalloc_range(struct inode *inode, struct page *locked_page, { int ret; int force_cow = need_force_cow(inode, start, end); - struct btrfs_root *root = BTRFS_I(inode)->root; - struct btrfs_dedup_info *dedup_info = root->fs_info->dedup_info; if (BTRFS_I(inode)->flags & BTRFS_INODE_NODATACOW && !force_cow) { ret = run_delalloc_nocow(inode, locked_page, start, end, @@ -1803,7 +1816,7 @@ static int run_delalloc_range(struct inode *inode, struct page *locked_page, } else if (BTRFS_I(inode)->flags & BTRFS_INODE_PREALLOC && !force_cow) { ret = run_delalloc_nocow(inode, locked_page, start, end, page_started, 0, nr_written); - } else if (!inode_need_compress(inode) && !dedup_info) { + } else if (!inode_need_compress(inode) && !inode_need_dedup(inode)) { ret = cow_file_range(inode, locked_page, start, end, page_started, nr_written, 1); } else {