Merge branch 'for-chris' of git://repo.or.cz/btrfs-progs-unstable/devel into raid56

Conflicts:
	ctree.h

Signed-off-by: Chris Mason <chris.mason@fusionio.com>

1 files changed, 16 insertions, 0 deletions

diff --git a/volumes.c b/volumes.c
index 9df3efef..de9f2642 100644
--- a/volumes.c
+++ b/volumes.c
@@ -1385,6 +1385,22 @@ struct btrfs_device *btrfs_find_device(struct btrfs_root *root, u64 devid,
 	return NULL;
 }
 
+struct btrfs_device *btrfs_find_device_by_devid(struct btrfs_root *root,
+						u64 devid, int instance)
+{
+	struct list_head *head = &root->fs_info->fs_devices->devices;
+	struct btrfs_device *dev;
+	struct list_head *cur;
+	int num_found = 0;
+
+	list_for_each(cur, head) {
+		dev = list_entry(cur, struct btrfs_device, dev_list);
+		if (dev->devid == devid && num_found++ == instance)
+			return dev;
+	}
+	return NULL;
+}
+
 int btrfs_bootstrap_super_map(struct btrfs_mapping_tree *map_tree,
 			      struct btrfs_fs_devices *fs_devices)
 {