leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor cleanup of btrfs_real_readdir()

Browse Source 
Date: Sun, 17 Aug 2008 17:08:36 +0100
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:
David Woodhouse 2008-08-17 17:08:36 +01:00 committed by Chris Mason
parent 5ecc7e5d1d
commit 49593bfa57
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
fs/btrfs/inode.c
View File

@ -1920,34 +1920,34 @@ static int btrfs_real_readdir(struct file *filp, void *dirent,
return 0; return 0;
filp->f_pos = 1; filp->f_pos = 1;
} }
key.objectid = inode->i_ino;
path = btrfs_alloc_path();
path->reada = 2;
/* 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) {
u64 pino = parent_ino(filp->f_path.dentry); u64 pino = parent_ino(filp->f_path.dentry);
over = filldir(dirent, "..", 2, over = filldir(dirent, "..", 2,
2, pino, DT_DIR); 2, pino, DT_DIR);
if (over) if (over)
goto nopos; return 0;
filp->f_pos = 2; filp->f_pos = 2;
} }
path = btrfs_alloc_path();
path->reada = 2;
btrfs_set_key_type(&key, key_type); btrfs_set_key_type(&key, key_type);
key.offset = filp->f_pos; key.offset = filp->f_pos;
key.objectid = inode->i_ino;
ret = btrfs_search_slot(NULL, root, &key, path, 0, 0); ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
if (ret < 0) if (ret < 0)
goto err; goto err;
advance = 0; advance = 0;
while(1) {
while (1) {
leaf = path->nodes[0]; leaf = path->nodes[0];
nritems = btrfs_header_nritems(leaf); nritems = btrfs_header_nritems(leaf);
slot = path->slots[0]; slot = path->slots[0];
if (advance || slot >= nritems) { if (advance || slot >= nritems) {
if (slot >= nritems -1) { if (slot >= nritems - 1) {
ret = btrfs_next_leaf(root, path); ret = btrfs_next_leaf(root, path);
if (ret) if (ret)
break; break;
@ -1971,19 +1971,23 @@ static int btrfs_real_readdir(struct file *filp, void *dirent,
continue; continue;
filp->f_pos = found_key.offset; filp->f_pos = found_key.offset;
advance = 1;
di = btrfs_item_ptr(leaf, slot, struct btrfs_dir_item); di = btrfs_item_ptr(leaf, slot, struct btrfs_dir_item);
di_cur = 0; di_cur = 0;
di_total = btrfs_item_size(leaf, item); di_total = btrfs_item_size(leaf, item);
while(di_cur < di_total) {
while (di_cur < di_total) {
struct btrfs_key location; struct btrfs_key location;
name_len = btrfs_dir_name_len(leaf, di); name_len = btrfs_dir_name_len(leaf, di);
if (name_len < 32) { if (name_len <= sizeof(tmp_name)) {
name_ptr = tmp_name; name_ptr = tmp_name;
} else { } else {
name_ptr = kmalloc(name_len, GFP_NOFS); name_ptr = kmalloc(name_len, GFP_NOFS);
BUG_ON(!name_ptr); if (!name_ptr) {
ret = -ENOMEM;
goto err;
}
} }
read_extent_buffer(leaf, name_ptr, read_extent_buffer(leaf, name_ptr,
(unsigned long)(di + 1), name_len); (unsigned long)(di + 1), name_len);
@ -1991,8 +1995,7 @@ static int btrfs_real_readdir(struct file *filp, void *dirent,
d_type = btrfs_filetype_table[btrfs_dir_type(leaf, di)]; d_type = btrfs_filetype_table[btrfs_dir_type(leaf, di)];
btrfs_dir_item_key_to_cpu(leaf, di, &location); btrfs_dir_item_key_to_cpu(leaf, di, &location);
over = filldir(dirent, name_ptr, name_len, over = filldir(dirent, name_ptr, name_len,
found_key.offset, found_key.offset, location.objectid,
location.objectid,
d_type); d_type);
if (name_ptr != tmp_name) if (name_ptr != tmp_name)
@ -2000,12 +2003,15 @@ static int btrfs_real_readdir(struct file *filp, void *dirent,
if (over) if (over)
goto nopos; goto nopos;
di_len = btrfs_dir_name_len(leaf, di) + di_len = btrfs_dir_name_len(leaf, di) +
btrfs_dir_data_len(leaf, di) +sizeof(*di); btrfs_dir_data_len(leaf, di) + sizeof(*di);
di_cur += di_len; di_cur += di_len;
di = (struct btrfs_dir_item *)((char *)di + di_len); di = (struct btrfs_dir_item *)((char *)di + di_len);
} }
} }
/* Reached end of directory/root. Bump pos past the last item. */
if (key_type == BTRFS_DIR_INDEX_KEY) if (key_type == BTRFS_DIR_INDEX_KEY)
filp->f_pos = INT_LIMIT(typeof(filp->f_pos)); filp->f_pos = INT_LIMIT(typeof(filp->f_pos));
else else