From 8c4b20bc0b9d491bee1efb1a18d87852020f045d Mon Sep 17 00:00:00 2001 From: Hari Gowtham Date: Tue, 21 Aug 2018 13:00:48 +0530 Subject: marker: fix for coverity issues Fixes CID: 1325591 1356503 1325540 1351704 Change-Id: I325b1184baa81402eaa009cb36ab95e5de812f6c updates: bz#789278 Signed-off-by: Hari Gowtham --- xlators/features/marker/src/marker-quota.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'xlators/features/marker/src/marker-quota.c') diff --git a/xlators/features/marker/src/marker-quota.c b/xlators/features/marker/src/marker-quota.c index 42c23403ce7..f6a0df810bc 100644 --- a/xlators/features/marker/src/marker-quota.c +++ b/xlators/features/marker/src/marker-quota.c @@ -1671,7 +1671,7 @@ mq_initiate_quota_task (void *opaque) out: if (dirty) { - if (ret < 0 || prev_dirty) { + if (ret < 0) { /* On failure clear dirty status flag. * In the next lookup inspect_directory_xattr * can set the status flag and fix the @@ -2127,14 +2127,16 @@ mq_xattr_state (xlator_t *this, loc_t *origin_loc, dict_t *dict, ret = -1; goto out; } - } - - if (buf.ia_type == IA_IFDIR || loc_is_root(&loc)) - mq_inspect_directory_xattr (this, ctx, contribution, &loc, dict, + if (buf.ia_type == IA_IFDIR) + mq_inspect_directory_xattr (this, ctx, contribution, + &loc, dict, buf); + else + mq_inspect_file_xattr (this, ctx, contribution, + &loc, dict, buf); + } else { + mq_inspect_directory_xattr (this, ctx, 0, &loc, dict, buf); - else - mq_inspect_file_xattr (this, ctx, contribution, &loc, dict, - buf); + } out: loc_wipe (&loc); -- cgit