diff options
author | Vijay Bellur <vbellur@redhat.com> | 2013-08-11 11:25:59 -0700 |
---|---|---|
committer | Gerrit Code Review <review@dev.gluster.org> | 2013-08-11 11:25:59 -0700 |
commit | 8d14cc856454ad43a927987b98b2799a9754f15b (patch) | |
tree | 880d59aa94554a5c88eb81a908b1415da44b2fe1 | |
parent | ab93371991c7ca8185e918b5bd4d148b3371591b (diff) | |
parent | a4eaab2c175416f5462d44e56024728343bd3bb9 (diff) |
Merge "features/marker: Fix an incorrect NULL check" into quota
-rw-r--r-- | xlators/features/marker/src/marker-quota.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/xlators/features/marker/src/marker-quota.c b/xlators/features/marker/src/marker-quota.c index db10586c..f627011f 100644 --- a/xlators/features/marker/src/marker-quota.c +++ b/xlators/features/marker/src/marker-quota.c @@ -1929,7 +1929,7 @@ fr_destroy: return -1; } -static int +int mq_prepare_txn_frame (xlator_t *this, loc_t *loc, quota_inode_ctx_t *ctx, inode_contribution_t *contri, @@ -1939,7 +1939,7 @@ mq_prepare_txn_frame (xlator_t *this, loc_t *loc, int ret = -1; quota_local_t *local = NULL; - if (!this || !loc || new_frame) + if (!this || !loc || !new_frame) goto err; frame = create_frame (this, this->ctx->pool); @@ -1969,9 +1969,10 @@ mq_prepare_txn_frame (xlator_t *this, loc_t *loc, ret = 0; *new_frame = frame; + return ret; + fr_destroy: QUOTA_STACK_DESTROY (frame, this); - err: return ret; } |