mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-05 02:19:51 +00:00
Code Issues Releases Wiki Activity

Btrfs: fix the same inode id problem when doing auto defragment

Browse source 
Two files in the different subvolumes may have the same inode id, so
The rb-tree which is used to manage the defragment object must take it
into account. This patch fix this problem.

Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
This commit is contained in:
Miao Xie 2012-05-24 18:58:27 +08:00 committed by Josef Bacik
parent 2adcac1a73
commit 762f226326
1 changed files with 39 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
fs/btrfs/file.c
View file

@ -65,6 +65,21 @@ struct inode_defrag {
int cycled; int cycled;
}; };
static int __compare_inode_defrag(struct inode_defrag *defrag1,
struct inode_defrag *defrag2)
{
if (defrag1->root > defrag2->root)
return 1;
else if (defrag1->root < defrag2->root)
return -1;
else if (defrag1->ino > defrag2->ino)
return 1;
else if (defrag1->ino < defrag2->ino)
return -1;
else
return 0;
}
/* pop a record for an inode into the defrag tree. The lock /* pop a record for an inode into the defrag tree. The lock
* must be held already * must be held already
* *
@ -81,15 +96,17 @@ static void __btrfs_add_inode_defrag(struct inode *inode,
struct inode_defrag *entry; struct inode_defrag *entry;
struct rb_node **p; struct rb_node **p;
struct rb_node *parent = NULL; struct rb_node *parent = NULL;
int ret;
p = &root->fs_info->defrag_inodes.rb_node; p = &root->fs_info->defrag_inodes.rb_node;
while (*p) { while (*p) {
parent = *p; parent = *p;
entry = rb_entry(parent, struct inode_defrag, rb_node); entry = rb_entry(parent, struct inode_defrag, rb_node);
if (defrag->ino < entry->ino) ret = __compare_inode_defrag(defrag, entry);
if (ret < 0)
p = &parent->rb_left; p = &parent->rb_left;
else if (defrag->ino > entry->ino) else if (ret > 0)
p = &parent->rb_right; p = &parent->rb_right;
else { else {
/* if we're reinserting an entry for /* if we're reinserting an entry for
@ -159,28 +176,35 @@ int btrfs_add_inode_defrag(struct btrfs_trans_handle *trans,
/* /*
* must be called with the defrag_inodes lock held * 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 rb_node **next)
{ {
struct inode_defrag *entry = NULL; struct inode_defrag *entry = NULL;
struct inode_defrag tmp;
struct rb_node *p; struct rb_node *p;
struct rb_node *parent = NULL; struct rb_node *parent = NULL;
int ret;
tmp.ino = ino;
tmp.root = root;
p = info->defrag_inodes.rb_node; p = info->defrag_inodes.rb_node;
while (p) { while (p) {
parent = p; parent = p;
entry = rb_entry(parent, struct inode_defrag, rb_node); entry = rb_entry(parent, struct inode_defrag, rb_node);
if (ino < entry->ino) ret = __compare_inode_defrag(&tmp, entry);
if (ret < 0)
p = parent->rb_left; p = parent->rb_left;
else if (ino > entry->ino) else if (ret > 0)
p = parent->rb_right; p = parent->rb_right;
else else
return entry; return entry;
} }
if (next) { if (next) {
while (parent && ino > entry->ino) { while (parent && __compare_inode_defrag(&tmp, entry) > 0) {
parent = rb_next(parent); parent = rb_next(parent);
entry = rb_entry(parent, struct inode_defrag, rb_node); entry = rb_entry(parent, struct inode_defrag, rb_node);
} }
@ -202,6 +226,7 @@ int btrfs_run_defrag_inodes(struct btrfs_fs_info *fs_info)
struct btrfs_key key; struct btrfs_key key;
struct btrfs_ioctl_defrag_range_args range; struct btrfs_ioctl_defrag_range_args range;
u64 first_ino = 0; u64 first_ino = 0;
u64 root_objectid = 0;
int num_defrag; int num_defrag;
int defrag_batch = 1024; int defrag_batch = 1024;
@ -214,11 +239,14 @@ int btrfs_run_defrag_inodes(struct btrfs_fs_info *fs_info)
n = NULL; n = NULL;
/* find an inode to defrag */ /* find an inode to defrag */
defrag = btrfs_find_defrag_inode(fs_info, first_ino, &n); defrag = btrfs_find_defrag_inode(fs_info, root_objectid,
first_ino, &n);
if (!defrag) { if (!defrag) {
if (n) if (n) {
defrag = rb_entry(n, struct inode_defrag, rb_node); defrag = rb_entry(n, struct inode_defrag,
else if (first_ino) { rb_node);
} else if (root_objectid || first_ino) {
root_objectid = 0;
first_ino = 0; first_ino = 0;
continue; continue;
} else { } else {
@ -228,6 +256,7 @@ int btrfs_run_defrag_inodes(struct btrfs_fs_info *fs_info)
/* remove it from the rbtree */ /* remove it from the rbtree */
first_ino = defrag->ino + 1; first_ino = defrag->ino + 1;
root_objectid = defrag->root;
rb_erase(&defrag->rb_node, &fs_info->defrag_inodes); rb_erase(&defrag->rb_node, &fs_info->defrag_inodes);
if (btrfs_fs_closing(fs_info)) if (btrfs_fs_closing(fs_info))