From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Thu, 2 Dec 2010 12:23:20 +0000 (+0100)
Subject: Fix subvolume handling
X-Git-Tag: 1.99~64^2~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=93e0c7a7c20dc469e3f30631fdf444d96f07d85b;p=thirdparty%2Fgrub.git

Fix subvolume handling
---

diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
index 1afd8fbb4..7ad2d40ff 100644
--- a/grub-core/fs/btrfs.c
+++ b/grub-core/fs/btrfs.c
@@ -702,13 +702,14 @@ find_path (struct grub_btrfs_data *data,
 	  return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
 			     "symlinks not supported");
 	}
-	
+
       switch (cdirel->key.type)
 	{
 	case GRUB_BTRFS_ITEM_TYPE_ROOT_ITEM:
 	  {
 	    struct grub_btrfs_root_item ri;
-	    err = lower_bound (data, disk, &cdirel->key, &key_out, *tree,
+	    err = lower_bound (data, disk, &cdirel->key, &key_out,
+			       data->sblock.root_tree,
 			       &elemaddr, &elemsize, NULL);
 	    if (err)
 	      return err;