From patchwork Fri Apr 1 06:35:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 8720551 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 18E81C0553 for ; Fri, 1 Apr 2016 06:36:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3EACC203AB for ; Fri, 1 Apr 2016 06:36:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5E2E7203AA for ; Fri, 1 Apr 2016 06:36:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758620AbcDAGfp (ORCPT ); Fri, 1 Apr 2016 02:35:45 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:33345 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1758445AbcDAGfn (ORCPT ); Fri, 1 Apr 2016 02:35:43 -0400 X-IronPort-AV: E=Sophos;i="5.20,367,1444665600"; d="scan'208";a="419986" Received: from unknown (HELO cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 01 Apr 2016 14:35:23 +0800 Received: from localhost.localdomain (unknown [10.167.226.34]) by cn.fujitsu.com (Postfix) with ESMTP id 0B6124056412; Fri, 1 Apr 2016 14:35:20 +0800 (CST) From: Qu Wenruo To: linux-btrfs@vger.kernel.org Cc: Wang Xiaoguang Subject: [PATCH v10 14/21] btrfs: dedupe: add per-file online dedupe control Date: Fri, 1 Apr 2016 14:35:05 +0800 Message-Id: <1459492512-31435-15-git-send-email-quwenruo@cn.fujitsu.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1459492512-31435-1-git-send-email-quwenruo@cn.fujitsu.com> References: <1459492512-31435-1-git-send-email-quwenruo@cn.fujitsu.com> MIME-Version: 1.0 X-yoursite-MailScanner-ID: 0B6124056412.A8EE3 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: quwenruo@cn.fujitsu.com X-Spam-Status: No, score=-7.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_dedupe() to implement per-file online dedupe control. Signed-off-by: Wang Xiaoguang --- fs/btrfs/inode.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 96790d0..c80fd74 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -708,6 +708,18 @@ static void end_dedupe_extent(struct inode *inode, u64 start, } } +static inline int inode_need_dedupe(struct btrfs_fs_info *fs_info, + struct inode *inode) +{ + if (!fs_info->dedupe_enabled) + return 0; + + if (BTRFS_I(inode)->flags & BTRFS_INODE_NODEDUPE) + return 0; + + return 1; +} + /* * phase two of compressed writeback. This is the ordered portion * of the code, which only gets called in the order the work was @@ -1680,7 +1692,8 @@ 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) && !fs_info->dedupe_enabled) { + } else if (!inode_need_compress(inode) && + !inode_need_dedupe(fs_info, inode)) { ret = cow_file_range(inode, locked_page, start, end, page_started, nr_written, 1, NULL); } else {