From patchwork Fri Oct 28 02:31:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qu Wenruo X-Patchwork-Id: 9400891 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B9702605EE for ; Fri, 28 Oct 2016 02:32:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A86BE2A0E3 for ; Fri, 28 Oct 2016 02:32:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9C3362A113; Fri, 28 Oct 2016 02:32:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A44DE2A0E3 for ; Fri, 28 Oct 2016 02:32:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965894AbcJ1CcO (ORCPT ); Thu, 27 Oct 2016 22:32:14 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:48358 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S938630AbcJ1CcN (ORCPT ); Thu, 27 Oct 2016 22:32:13 -0400 X-IronPort-AV: E=Sophos;i="5.20,367,1444665600"; d="scan'208";a="932106" Received: from unknown (HELO cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 28 Oct 2016 10:32:04 +0800 Received: from adam-work.localdomain (unknown [10.167.226.34]) by cn.fujitsu.com (Postfix) with ESMTP id 159F6406CF6D; Fri, 28 Oct 2016 10:32:03 +0800 (CST) From: Qu Wenruo To: linux-btrfs@vger.kernel.org, dsterba@suse.cz Subject: [PATCH 01/19] btrfs-progs: raid56: Introduce raid56 header for later recovery usage Date: Fri, 28 Oct 2016 10:31:37 +0800 Message-Id: <20161028023155.27336-2-quwenruo@cn.fujitsu.com> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20161028023155.27336-1-quwenruo@cn.fujitsu.com> References: <20161028023155.27336-1-quwenruo@cn.fujitsu.com> MIME-Version: 1.0 X-yoursite-MailScanner-ID: 159F6406CF6D.AE7C9 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: quwenruo@cn.fujitsu.com Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Although there is only 2 function in raid56 header, later recovery will introduce a lot of tables, so split it from disk-io.h. Signed-off-by: Qu Wenruo --- Makefile.in | 2 +- disk-io.h | 4 ---- raid56.h | 20 ++++++++++++++++++++ volumes.c | 1 + 4 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 raid56.h diff --git a/Makefile.in b/Makefile.in index fe3218c..73b2919 100644 --- a/Makefile.in +++ b/Makefile.in @@ -106,7 +106,7 @@ libbtrfs_objects = send-stream.o send-utils.o kernel-lib/rbtree.o btrfs-list.o \ libbtrfs_headers = send-stream.h send-utils.h send.h kernel-lib/rbtree.h btrfs-list.h \ kernel-lib/crc32c.h kernel-lib/list.h kerncompat.h \ kernel-lib/radix-tree.h extent-cache.h \ - extent_io.h ioctl.h ctree.h btrfsck.h version.h + extent_io.h ioctl.h ctree.h btrfsck.h raid56.h version.h TESTS = fsck-tests.sh convert-tests.sh udev_rules = 64-btrfs-dm.rules diff --git a/disk-io.h b/disk-io.h index 245626c..6efd75b 100644 --- a/disk-io.h +++ b/disk-io.h @@ -190,8 +190,4 @@ int write_tree_block(struct btrfs_trans_handle *trans, int write_and_map_eb(struct btrfs_trans_handle *trans, struct btrfs_root *root, struct extent_buffer *eb); -/* raid56.c */ -void raid6_gen_syndrome(int disks, size_t bytes, void **ptrs); -int raid5_gen_result(int nr_devs, size_t stripe_len, int dest, void **data); - #endif diff --git a/raid56.h b/raid56.h new file mode 100644 index 0000000..54f0cde --- /dev/null +++ b/raid56.h @@ -0,0 +1,20 @@ +/* + * Copyright (C) 2016 Fujitsu. All rights reserved. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License v2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 021110-1307, USA. + */ + +void raid6_gen_syndrome(int disks, size_t bytes, void **ptrs); +int raid5_gen_result(int nr_devs, size_t stripe_len, int dest, void **data); diff --git a/volumes.c b/volumes.c index 6d7adef..f8c50d9 100644 --- a/volumes.c +++ b/volumes.c @@ -28,6 +28,7 @@ #include "print-tree.h" #include "volumes.h" #include "utils.h" +#include "raid56.h" struct stripe { struct btrfs_device *dev;