diff options
| author | Pranith Kumar K <pranithk@gluster.com> | 2012-05-18 22:00:03 +0530 |
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2012-05-19 05:21:42 -0700 |
| commit | d54d9e9412a267ed8abaee1c682c7b6f734e8205 (patch) | |
| tree | e52537ce35e9091999e74ccd436400532fb75a87 /xlators | |
| parent | 86e0789a8e3c9e7289857fee59b9dedffc5b5e54 (diff) | |
cluster/afr: Assign gfid path if path is NULL in lookupv3.3.0qa42
BUG: 820355
Change-Id: I68bea2b8408e741af5fff9e6588ddb87421dbda4
Signed-off-by: Pranith Kumar K <pranithk@gluster.com>
Reviewed-on: http://review.gluster.com/3374
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/cluster/afr/src/afr-common.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c index 9b6c36fb0..06b2c0ef2 100644 --- a/xlators/cluster/afr/src/afr-common.c +++ b/xlators/cluster/afr/src/afr-common.c @@ -2113,20 +2113,25 @@ afr_lookup (call_frame_t *frame, xlator_t *this, frame->local = local; local->fop = GF_FOP_LOOKUP; - if (!strcmp (loc->path, "/" GF_REPLICATE_TRASH_DIR)) { - op_errno = ENOENT; + loc_copy (&local->loc, loc); + ret = loc_path (&local->loc, NULL); + if (ret < 0) { + op_errno = EINVAL; goto out; } - loc_copy (&local->loc, loc); + if (!strcmp (local->loc.path, "/" GF_REPLICATE_TRASH_DIR)) { + op_errno = ENOENT; + goto out; + } - ret = inode_ctx_get (loc->inode, this, &ctx); + ret = inode_ctx_get (local->loc.inode, this, &ctx); if (ret == 0) { /* lookup is a revalidate */ local->read_child_index = afr_inode_get_read_ctx (this, - loc->inode, - NULL); + local->loc.inode, + NULL); } else { LOCK (&priv->read_child_lock); { @@ -2164,14 +2169,14 @@ afr_lookup (call_frame_t *frame, xlator_t *this, local->call_count = afr_up_children_count (local->child_up, priv->child_count); - ret = afr_lookup_xattr_req_prepare (local, this, xattr_req, loc, + ret = afr_lookup_xattr_req_prepare (local, this, xattr_req, &local->loc, &gfid_req); if (ret) { local->op_errno = -ret; goto out; } afr_lookup_save_gfid (local->cont.lookup.gfid_req, gfid_req, - loc); + &local->loc); local->fop = GF_FOP_LOOKUP; for (i = 0; i < priv->child_count; i++) { if (local->child_up[i]) { @@ -2179,7 +2184,7 @@ afr_lookup (call_frame_t *frame, xlator_t *this, (void *) (long) i, priv->children[i], priv->children[i]->fops->lookup, - loc, local->xattr_req); + &local->loc, local->xattr_req); if (!--call_count) break; } |