From patchwork Fri Mar 18 15:55:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Jansen X-Patchwork-Id: 644291 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2IFtT42000764 for ; Fri, 18 Mar 2011 15:55:30 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932248Ab1CRPzX (ORCPT ); Fri, 18 Mar 2011 11:55:23 -0400 Received: from mort.rzone.de ([81.169.144.234]:55481 "EHLO mort.rzone.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932247Ab1CRPzL (ORCPT ); Fri, 18 Mar 2011 11:55:11 -0400 Received: from gargravarr.store (gargravarr.store [192.168.42.236]) by mort.rzone.de (Postfix) with ESMTP id 05F304D6; Fri, 18 Mar 2011 16:55:10 +0100 (MET) Received: by gargravarr.store (Postfix, from userid 32466) id DE0BAC077; Fri, 18 Mar 2011 16:55:09 +0100 (CET) From: Arne Jansen To: chris.mason@oracle.com, linux-btrfs@vger.kernel.org Subject: [PATCH v4 2/6] btrfs: make struct map_lookup public Date: Fri, 18 Mar 2011 16:55:05 +0100 Message-Id: X-Mailer: git-send-email 1.7.3.4 In-Reply-To: References: In-Reply-To: References: 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]); Fri, 18 Mar 2011 15:55:30 +0000 (UTC) diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 94334d9..7dc9fa5 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -33,25 +33,11 @@ #include "volumes.h" #include "async-thread.h" -struct map_lookup { - u64 type; - int io_align; - int io_width; - int stripe_len; - int sector_size; - int num_stripes; - int sub_stripes; - struct btrfs_bio_stripe stripes[]; -}; - static int init_first_rw_device(struct btrfs_trans_handle *trans, struct btrfs_root *root, struct btrfs_device *device); static int btrfs_relocate_sys_chunks(struct btrfs_root *root); -#define map_lookup_size(n) (sizeof(struct map_lookup) + \ - (sizeof(struct btrfs_bio_stripe) * (n))) - static DEFINE_MUTEX(uuid_mutex); static LIST_HEAD(fs_uuids); diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h index 7af6144..0ccc982 100644 --- a/fs/btrfs/volumes.h +++ b/fs/btrfs/volumes.h @@ -129,6 +129,20 @@ struct btrfs_bio_stripe { u64 physical; }; +struct map_lookup { + u64 type; + int io_align; + int io_width; + int stripe_len; + int sector_size; + int num_stripes; + int sub_stripes; + struct btrfs_bio_stripe stripes[]; +}; + +#define map_lookup_size(n) (sizeof(struct map_lookup) + \ + (sizeof(struct btrfs_bio_stripe) * (n))) + struct btrfs_multi_bio { atomic_t stripes_pending; bio_end_io_t *end_io;