projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Btrfs: prevent loops in the directory tree when creating snapshots
[linux-2.6-block.git]
/
fs
/
btrfs
/
disk-io.c
diff --git
a/fs/btrfs/disk-io.c
b/fs/btrfs/disk-io.c
index 8d7866b733d63105f32c44df3cb922f54b9eef6f..e18250a6fd2db6009d07eadd339fcc3e3e09fc15 100644
(file)
--- a/
fs/btrfs/disk-io.c
+++ b/
fs/btrfs/disk-io.c
@@
-1129,7
+1129,7
@@
struct btrfs_root *btrfs_read_fs_root(struct btrfs_fs_info *fs_info,
kfree(root);
return ERR_PTR(ret);
}
kfree(root);
return ERR_PTR(ret);
}
-
+#if 0
ret = btrfs_sysfs_add_root(root);
if (ret) {
free_extent_buffer(root->node);
ret = btrfs_sysfs_add_root(root);
if (ret) {
free_extent_buffer(root->node);
@@
-1137,6
+1137,7
@@
struct btrfs_root *btrfs_read_fs_root(struct btrfs_fs_info *fs_info,
kfree(root);
return ERR_PTR(ret);
}
kfree(root);
return ERR_PTR(ret);
}
+#endif
root->in_sysfs = 1;
return root;
}
root->in_sysfs = 1;
return root;
}
@@
-1963,8
+1964,10
@@
int btrfs_free_fs_root(struct btrfs_fs_info *fs_info, struct btrfs_root *root)
down_write(&root->anon_super.s_umount);
kill_anon_super(&root->anon_super);
}
down_write(&root->anon_super.s_umount);
kill_anon_super(&root->anon_super);
}
+#if 0
if (root->in_sysfs)
btrfs_sysfs_del_root(root);
if (root->in_sysfs)
btrfs_sysfs_del_root(root);
+#endif
if (root->node)
free_extent_buffer(root->node);
if (root->commit_root)
if (root->node)
free_extent_buffer(root->node);
if (root->commit_root)