Add generation number to btrfs_header, readdir fixes, hash collision fixes
Signed-off-by: Chris Mason <chris.mason@oracle.com>
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 8970e9a..a2db055 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -199,7 +199,7 @@
btrfs_init_path(&path);
ret = btrfs_lookup_dir_item(NULL, root, &path, dir->i_ino, name,
namelen, 0);
- if (ret) {
+ if (ret || !btrfs_match_dir_item_name(root, &path, name, namelen)) {
*ino = 0;
goto out;
}
@@ -247,7 +247,7 @@
int slot;
int advance;
unsigned char d_type = DT_UNKNOWN;
- int over;
+ int over = 0;
key.objectid = inode->i_ino;
key.flags = 0;
@@ -258,7 +258,7 @@
if (ret < 0) {
goto err;
}
- advance = filp->f_pos > 0 && ret != 0;
+ advance = 0;
while(1) {
leaf = btrfs_buffer_leaf(path.nodes[0]);
nritems = btrfs_header_nritems(&leaf->header);
@@ -282,13 +282,17 @@
break;
if (btrfs_disk_key_type(&item->key) != BTRFS_DIR_ITEM_KEY)
continue;
+ if (btrfs_disk_key_offset(&item->key) < filp->f_pos)
+ continue;
di = btrfs_item_ptr(leaf, slot, struct btrfs_dir_item);
over = filldir(dirent, (const char *)(di + 1),
btrfs_dir_name_len(di),
btrfs_disk_key_offset(&item->key),
btrfs_dir_objectid(di), d_type);
- if (over)
+ if (over) {
+ filp->f_pos = btrfs_disk_key_offset(&item->key);
break;
+ }
filp->f_pos = btrfs_disk_key_offset(&item->key) + 1;
}
ret = 0;
@@ -425,7 +429,6 @@
dentry->d_name.name, dentry->d_name.len,
dentry->d_parent->d_inode->i_ino,
inode->i_ino, 0);
- BUG_ON(ret);
return ret;
}
@@ -466,6 +469,7 @@
{
sb->s_dirt = 0;
printk("btrfs write_super!\n");
+ filemap_flush(sb->s_bdev->bd_inode->i_mapping);
}
static int btrfs_sync_fs(struct super_block *sb, int wait)