From dbec1f6a22f79b3b7d86401fefc1a2f6fb0dc820 Mon Sep 17 00:00:00 2001
From: vmallika <vmallika@redhat.com>
Date: Fri, 10 Jul 2015 16:04:16 +0530
Subject: [PATCH 231/234] quota/marker: inspect file/dir invoked without having quota xattrs requested

In a lookup and build ancestry quota xattrs are
not requested, it gives wrong assumption that
quota xattrs are missing and tries to do
healing process

> Change-Id: I7135101ec0edc72a6310dbb304227eaa3b16cb46
> BUG: 1207735
> Signed-off-by: vmallika <vmallika@redhat.com>

Change-Id: I819e1fd01a85d8dc6238b278662062b3ed9bc280
BUG: 1224177
Signed-off-by: vmallika <vmallika@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/52778
Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
Tested-by: Krishnan Parthasarathi <kparthas@redhat.com>
---
 xlators/features/marker/src/marker.c |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/xlators/features/marker/src/marker.c b/xlators/features/marker/src/marker.c
index c7c9fd3..db6943c 100644
--- a/xlators/features/marker/src/marker.c
+++ b/xlators/features/marker/src/marker.c
@@ -2719,6 +2719,10 @@ marker_lookup (call_frame_t *frame, xlator_t *this,
 
         priv = this->private;
 
+        xattr_req = xattr_req ? dict_ref (xattr_req) : dict_new ();
+        if (!xattr_req)
+                goto err;
+
         if (priv->feature_enabled == 0)
                 goto wind;
 
@@ -2732,15 +2736,21 @@ marker_lookup (call_frame_t *frame, xlator_t *this,
         if (ret == -1)
                 goto err;
 
-        if ((priv->feature_enabled & GF_QUOTA) && xattr_req)
+        if ((priv->feature_enabled & GF_QUOTA))
                 mq_req_xattr (this, loc, xattr_req, NULL);
 wind:
         STACK_WIND (frame, marker_lookup_cbk, FIRST_CHILD(this),
                     FIRST_CHILD(this)->fops->lookup, loc, xattr_req);
+
+        dict_unref (xattr_req);
+
         return 0;
 err:
         STACK_UNWIND_STRICT (lookup, frame, -1, ENOMEM, NULL, NULL, NULL, NULL);
 
+        if (xattr_req)
+                dict_unref (xattr_req);
+
         return 0;
 }
 
@@ -2780,8 +2790,6 @@ marker_build_ancestry_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
                         continue;
                 }
 
-                mq_xattr_state (this, &loc, entry->dict, entry->d_stat);
-
                 inode_unref (parent);
                 parent = inode_ref (entry->inode);
                 loc_wipe (&loc);
-- 
1.7.1