From 3816a07556f9c31f4dbede90f3f3120601c9d106 Mon Sep 17 00:00:00 2001 From: Chris Mason Date: Tue, 10 Apr 2007 20:07:20 -0400 Subject: [PATCH] --- yaml --- r: 128345 b: refs/heads/master c: 2d13d8d065cc7bbee6b1ad6ee3fe965d66badfe6 h: refs/heads/master i: 128343: d878b5e861bf70c2dc13e016454bbd0055b45a70 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/super.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e5a66b19d2bc..df02c35ed4c2 100644 --- 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 index 84abdde4e301..2972aaa9eb7e 100644 --- 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;