andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

stripe: don't send parent pointer in stripe_readdirp_lookup()

Browse Source 
Change-Id: I53e28f4046c13ad13c9300990a95480a5c62f180
BUG: 808353
Signed-off-by: shishir gowda <shishirng@gluster.com>
Reviewed-on: http://review.gluster.com/3232
Reviewed-by: Amar Tumballi <amarts@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
This commit is contained in:
shishir gowda 2012-05-02 11:59:35 +05:30 committed by Anand Avati
parent e4b3c0d90c
commit cfaf9989e6
1 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
xlators/cluster/stripe/src/stripe.c
View File

@ -3918,12 +3918,9 @@ stripe_readdirp_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
stripe_local_t *local = NULL;
call_frame_t *prev = NULL;
gf_dirent_t *local_entry = NULL;
int32_t ret = -1;
gf_dirent_t *tmp_entry = NULL;
xlator_list_t *trav = NULL;
loc_t loc = {0, };
inode_t *inode = NULL;
char *path;
int32_t count = 0;
stripe_private_t *priv = NULL;
int32_t subvols = 0;
@ -3969,7 +3966,6 @@ unlock:
if (xattrs)
(void) stripe_xattr_request_build (this, xattrs, 0, 0, 0);
count = op_ret;
ret = 0;
list_for_each_entry_safe (local_entry, tmp_entry,
(&local->entries.list), list) {
@ -3985,28 +3981,6 @@ unlock:
continue;
}
inode = inode_new (local->fd->inode->table);
if (!inode)
goto out;
loc.inode = inode;
loc.parent = local->fd->inode;
ret = inode_path (local->fd->inode, local_entry->d_name, &path);
if (ret != -1) {
loc.path = path;
} else if (inode) {
ret = inode_path (inode, NULL, &path);
if (ret != -1) {
loc.path = path;
} else {
goto out;
}
}
loc.name = strrchr (loc.path, '/');
loc.name++;
uuid_copy (loc.gfid, local_entry->d_stat.ia_gfid);
local_frame = copy_frame (frame);
if (!local_frame) {
@ -4022,6 +3996,10 @@ unlock:
goto out;
}
loc.inode = inode_ref (local_entry->inode);
uuid_copy (loc.gfid, local_entry->d_stat.ia_gfid);
local_ent->orig_frame = frame;
local_ent->call_count = subvols;
@ -4037,7 +4015,7 @@ unlock:
&loc, xattrs);
trav = trav->next;
}
inode_unref (loc.inode);
loc_wipe (&loc);
}
out:
if (!count) {