adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2025-01-03 22:53:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Btrfs: Fix .. lookup corner case

Browse source 
Inode ref item can be in the next leaf when we find "path->slots[0] ==
btrfs_header_nritems(...)".

Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
Yan 2008-07-24 12:19:32 -04:00 committed by Chris Mason
parent 974e35a82d
commit 445dceb78f
1 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
fs/btrfs/inode.c
View file

@ -1752,21 +1752,18 @@ static int btrfs_inode_by_name(struct inode *dir, struct dentry *dentry,
if (namelen == 2 && strcmp(name, "..") == 0) { if (namelen == 2 && strcmp(name, "..") == 0) {
struct btrfs_key key; struct btrfs_key key;
struct extent_buffer *leaf; struct extent_buffer *leaf;
u32 nritems;
int slot; int slot;
key.objectid = dir->i_ino; key.objectid = dir->i_ino;
key.offset = (u64)-1;
btrfs_set_key_type(&key, BTRFS_INODE_REF_KEY); btrfs_set_key_type(&key, BTRFS_INODE_REF_KEY);
key.offset = 0; if (ret < 0 || path->slots[0] == 0)
goto out_err;
ret = btrfs_search_slot(NULL, root, &key, path, 0, 0); ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
BUG_ON(ret == 0); BUG_ON(ret == 0);
ret = 0; ret = 0;
leaf = path->nodes[0]; leaf = path->nodes[0];
slot = path->slots[0]; slot = path->slots[0] - 1;
nritems = btrfs_header_nritems(leaf);
if (slot >= nritems)
goto out_err;
btrfs_item_key_to_cpu(leaf, &key, slot); btrfs_item_key_to_cpu(leaf, &key, slot);
if (key.objectid != dir->i_ino || if (key.objectid != dir->i_ino ||
@ -1980,16 +1977,15 @@ static int btrfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
/* special case for .., just use the back ref */ /* special case for .., just use the back ref */
if (filp->f_pos == 1) { if (filp->f_pos == 1) {
btrfs_set_key_type(&key, BTRFS_INODE_REF_KEY); btrfs_set_key_type(&key, BTRFS_INODE_REF_KEY);
key.offset = 0; key.offset = (u64)-1;
ret = btrfs_search_slot(NULL, root, &key, path, 0, 0); ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
BUG_ON(ret == 0); if (ret < 0 || path->slots[0] == 0) {
leaf = path->nodes[0];
slot = path->slots[0];
nritems = btrfs_header_nritems(leaf);
if (slot >= nritems) {
btrfs_release_path(root, path); btrfs_release_path(root, path);
goto read_dir_items; goto read_dir_items;
} }
BUG_ON(ret == 0);
leaf = path->nodes[0];
slot = path->slots[0] - 1;
btrfs_item_key_to_cpu(leaf, &found_key, slot); btrfs_item_key_to_cpu(leaf, &found_key, slot);
btrfs_release_path(root, path); btrfs_release_path(root, path);
if (found_key.objectid != key.objectid || if (found_key.objectid != key.objectid ||