1 files changed, 16 insertions, 15 deletions

diff --git a/xlators/features/quota/src/quota.h b/xlators/features/quota/src/quota.h
index 7ced27a6188..0395d78c9ef 100644
--- a/xlators/features/quota/src/quota.h
+++ b/xlators/features/quota/src/quota.h
@@ -10,25 +10,22 @@
 #ifndef _QUOTA_H
 #define _QUOTA_H
 
-#include "xlator.h"
-#include "call-stub.h"
-#include "defaults.h"
-#include "common-utils.h"
+#include <glusterfs/call-stub.h>
 #include "quota-mem-types.h"
-#include "glusterfs.h"
-#include "compat.h"
-#include "logging.h"
-#include "dict.h"
-#include "gf-event.h"
+#include <glusterfs/glusterfs.h>
+#include <glusterfs/compat.h>
+#include <glusterfs/logging.h>
+#include <glusterfs/dict.h>
+#include <glusterfs/gf-event.h>
 #include "rpcsvc.h"
 #include "rpc-clnt.h"
-#include "byte-order.h"
+#include <glusterfs/byte-order.h>
 #include "glusterfs3-xdr.h"
 #include "glusterfs3.h"
 #include "xdr-generic.h"
-#include "compat-errno.h"
+#include <glusterfs/compat-errno.h>
 #include "protocol-common.h"
-#include "quota-common-utils.h"
+#include <glusterfs/quota-common-utils.h>
 #include "quota-messages.h"
 
 #define DIRTY "dirty"
@@ -47,7 +44,7 @@
 
 #define QUOTA_WIND_FOR_INTERNAL_FOP(xdata, label)                              \
     do {                                                                       \
-        if (xdata && dict_get(xdata, GLUSTERFS_INTERNAL_FOP_KEY))              \
+        if (xdata && dict_get_sizen(xdata, GLUSTERFS_INTERNAL_FOP_KEY))        \
             goto label;                                                        \
     } while (0)
 
@@ -156,8 +153,8 @@ struct quota_inode_ctx {
     int64_t object_soft_lim;
     struct iatt buf;
     struct list_head parents;
-    struct timeval tv;
-    struct timeval prev_log;
+    time_t validate_time;
+    time_t prev_log_time;
     gf_boolean_t ancestry_built;
     gf_lock_t lock;
 };
@@ -202,6 +199,7 @@ struct quota_local {
 typedef struct quota_local quota_local_t;
 
 struct quota_priv {
+    /* FIXME: consider time_t for timeouts. */
     uint32_t soft_timeout;
     uint32_t hard_timeout;
     uint32_t log_timeout;
@@ -217,6 +215,9 @@ struct quota_priv {
     char *volume_uuid;
     uint64_t validation_count;
     int32_t quotad_conn_status;
+    pthread_mutex_t conn_mutex;
+    pthread_cond_t conn_cond;
+    gf_boolean_t conn_status;
 };
 typedef struct quota_priv quota_priv_t;