---

yaml --- r: 128345 b: refs/heads/master c: 2d13d8d h: refs/heads/master i: 128343: d878b5e v: v3
git-mirror · Apr 11, 2007 · 3816a07 · 3816a07
1 parent 99c5ac9
commit 3816a07
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2619ba1f0ff9540a9d84683310a1e350b5efde3d
+refs/heads/master: 2d13d8d065cc7bbee6b1ad6ee3fe965d66badfe6
diff --git a/trunk/fs/btrfs/super.c b/trunk/fs/btrfs/super.c
@@ -1853,13 +1853,13 @@ static int btrfs_ioctl(struct inode *inode, struct file *filp, unsigned int
 		path = btrfs_alloc_path();
 		if (!path)
 			return -ENOMEM;
-		root_dirid = btrfs_root_dirid(
-				      &root->fs_info->tree_root->root_item);
+		root_dirid = root->fs_info->sb->s_root->d_inode->i_ino,
 		mutex_lock(&root->fs_info->fs_mutex);
 		ret = btrfs_lookup_dir_item(NULL, root->fs_info->tree_root,
 				    path, root_dirid,
 				    vol_args.name, namelen, 0);
 		mutex_unlock(&root->fs_info->fs_mutex);
+		btrfs_free_path(path);
 		if (ret == 0)
 			return -EEXIST;