On Thu, May 24, 2012 at 10:42:19AM +0800, Miao Xie wrote:
> @@ -87,9 +102,9 @@ static void __btrfs_add_inode_defrag(struct inode *inode,
> parent = *p;
> entry = rb_entry(parent, struct inode_defrag, rb_node);
>
> - if (defrag->ino < entry->ino)
> + if (__compare_inode_defrag(defrag, entry) < 0)
> p = &parent->rb_left;
> - else if (defrag->ino > entry->ino)
> + else if (__compare_inode_defrag(defrag, entry) > 0)
> p = &parent->rb_right;
you don't need to call the __compare_inode_defrag twice, the comparison
result will not change under hands between the two calls.
> else {
> /* if we're reinserting an entry for
> @@ -159,28 +174,33 @@ int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans,
> /*
> * must be called with the defrag_inodes lock held
> */
> -struct inode_defrag *btrfs_find_defrag_inode(struct btrfs_fs_info *info, u64 ino,
> +struct inode_defrag *btrfs_find_defrag_inode(struct btrfs_fs_info *info,
> + u64 root, u64 ino,
> struct rb_node **next)
> {
> struct inode_defrag *entry = NULL;
> + struct inode_defrag tmp;
> struct rb_node *p;
> struct rb_node *parent = NULL;
>
> + tmp.ino = ino;
> + tmp.root = root;
> +
> p = info->defrag_inodes.rb_node;
> while (p) {
> parent = p;
> entry = rb_entry(parent, struct inode_defrag, rb_node);
>
> - if (ino < entry->ino)
> + if (__compare_inode_defrag(&tmp, entry) < 0)
> p = parent->rb_left;
> - else if (ino > entry->ino)
> + else if (__compare_inode_defrag(&tmp, entry) > 0)
(same here)
> p = parent->rb_right;
> else
> return entry;
> }
>
> if (next) {
> - while (parent && ino > entry->ino) {
> + while (parent && __compare_inode_defrag(&tmp, entry) > 0) {
> parent = rb_next(parent);
> entry = rb_entry(parent, struct inode_defrag, rb_node);
> }
david
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
