diff options
| -rw-r--r-- | xlators/features/marker/src/marker-quota.c | 3 | ||||
| -rw-r--r-- | xlators/features/marker/src/marker.c | 3 | ||||
| -rw-r--r-- | xlators/features/quota/src/quota.c | 8 |
3 files changed, 5 insertions, 9 deletions
diff --git a/xlators/features/marker/src/marker-quota.c b/xlators/features/marker/src/marker-quota.c index 63aa4efa44d..6034b963dfe 100644 --- a/xlators/features/marker/src/marker-quota.c +++ b/xlators/features/marker/src/marker-quota.c @@ -1257,7 +1257,8 @@ mq_set_inode_xattr (xlator_t *this, loc_t *loc) return 0; err: - QUOTA_STACK_DESTROY (frame, this); + if (frame) + QUOTA_STACK_DESTROY (frame, this); return 0; } diff --git a/xlators/features/marker/src/marker.c b/xlators/features/marker/src/marker.c index c1db70369a8..dc56714a94c 100644 --- a/xlators/features/marker/src/marker.c +++ b/xlators/features/marker/src/marker.c @@ -546,6 +546,9 @@ marker_create_frame (xlator_t *this, marker_local_t *local) frame = create_frame (this, this->ctx->pool); + if (!frame) + return -1; + frame->local = (void *) local; marker_start_setxattr (frame, this); diff --git a/xlators/features/quota/src/quota.c b/xlators/features/quota/src/quota.c index 5fcc65b7243..2afe58f6210 100644 --- a/xlators/features/quota/src/quota.c +++ b/xlators/features/quota/src/quota.c @@ -99,10 +99,6 @@ quota_loc_fill (loc_t *loc, inode_t *inode, inode_t *parent, char *path) ret = 0; - if (ret < 0) { - loc_wipe (loc); - } - return ret; } @@ -1275,10 +1271,6 @@ quota_check_limit (call_frame_t *frame, inode_t *inode, xlator_t *this, _inode = parent; just_validated = 0; - if (_inode == NULL) { - break; - } - value = 0; inode_ctx_get (_inode, this, &value); ctx = (quota_inode_ctx_t *)(unsigned long)value; |