diff options
| author | Junaid <junaid@gluster.com> | 2011-09-30 11:39:44 +0530 |
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2011-09-30 00:13:18 -0700 |
| commit | 6c5d3e40a6c1674b4fbe4e312ab01dd81219365c (patch) | |
| tree | b9e0080ef1d94219dd3e963afd576c62b200b2a9 | |
| parent | 83c2da72c0371a4d776d998d5695221533d9ea5f (diff) | |
features/marker-quota: Return error when inode-contribution not present in inode_ctx.v3.2.4qa5
Also, create the inode_contribution node even before checking for dirty and xattr not present in mq_inspect_directory_xattr function.
Change-Id: Ie5b6e6ba8d5abcfc6aeb9b192720ac10aac1319e
BUG: 3624
Reviewed-on: http://review.gluster.com/538
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Raghavendra G <raghavendra@gluster.com>
| -rw-r--r-- | xlators/features/marker/src/marker-quota.c | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/xlators/features/marker/src/marker-quota.c b/xlators/features/marker/src/marker-quota.c index f108b0142..bc7751698 100644 --- a/xlators/features/marker/src/marker-quota.c +++ b/xlators/features/marker/src/marker-quota.c @@ -1230,6 +1230,8 @@ mq_get_parent_inode_local (xlator_t *this, quota_local_t *local) GF_VALIDATE_OR_GOTO ("marker", this, out); GF_VALIDATE_OR_GOTO ("marker", local, out); + local->contri = NULL; + loc_wipe (&local->loc); ret = mq_loc_copy (&local->loc, &local->parent_loc); @@ -1263,6 +1265,7 @@ mq_get_parent_inode_local (xlator_t *this, quota_local_t *local) gf_log_callingfn (this->name, GF_LOG_WARNING, "contribution node list is empty which " "is an error"); + ret = -1; goto out; } @@ -2014,7 +2017,17 @@ mq_inspect_directory_xattr (xlator_t *this, gf_log (this->name, GF_LOG_WARNING, "mq_inode_ctx_new failed"); ret = -1; - goto out; + goto err; + } + } + + if (strcmp (loc->path, "/") != 0) { + contribution = mq_add_new_contribution_node (this, ctx, loc); + if (contribution == NULL) { + gf_log (this->name, GF_LOG_WARNING, + "cannot add a new contribution node"); + ret = -1; + goto err; } } @@ -2029,13 +2042,6 @@ mq_inspect_directory_xattr (xlator_t *this, if (strcmp (loc->path, "/") != 0) { not_root = _gf_true; - contribution = mq_add_new_contribution_node (this, ctx, loc); - if (contribution == NULL) { - gf_log (this->name, GF_LOG_DEBUG, - "cannot add a new contributio node"); - goto out; - } - GET_CONTRI_KEY (contri_key, contribution->gfid, ret); if (ret < 0) goto out; @@ -2077,7 +2083,8 @@ out: if (ret) mq_set_inode_xattr (this, loc); - return 0; +err: + return ret; } int32_t |