diff options
| author | Steve French <sfrench@us.ibm.com> | 2010-06-16 13:19:36 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2010-06-16 13:19:36 +0000 |
| commit | 0933a95dfdb1ae5c93e1ede5899f35acc2bb244d (patch) | |
| tree | 55ac47b819a2a2084f82f9d823d9152ac2a7f2b3 /fs/btrfs/root-tree.c | |
| parent | 12420ac341533f3715b3deb788637568f22b78ff (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/btrfs/root-tree.c')
| -rw-r--r-- | fs/btrfs/root-tree.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c index b91ccd97264..2d958be761c 100644 --- a/fs/btrfs/root-tree.c +++ b/fs/btrfs/root-tree.c @@ -330,7 +330,6 @@ int btrfs_del_root(struct btrfs_trans_handle *trans, struct btrfs_root *root, { struct btrfs_path *path; int ret; - u32 refs; struct btrfs_root_item *ri; struct extent_buffer *leaf; @@ -344,8 +343,6 @@ int btrfs_del_root(struct btrfs_trans_handle *trans, struct btrfs_root *root, leaf = path->nodes[0]; ri = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_root_item); - refs = btrfs_disk_root_refs(leaf, ri); - BUG_ON(refs != 0); ret = btrfs_del_item(trans, root, path); out: btrfs_free_path(path); |