[PATCH BUG:3020 1/1] Fix duplicate quota/marker symbols.

[Jeff Darcy <jdarcy@xxxxxxxxxx>]

Resolved by changing some of the marker symbols so they don't conflict.
(Sorry about attaching the wrong patch previously)

Signed-off-by: Jeff Darcy <jdarcy@xxxxxxxxxx>
---
 xlators/features/marker/src/marker-quota-helper.c |    8 ++++----
 xlators/features/marker/src/marker-quota-helper.h |    4 ++--
 xlators/features/marker/src/marker-quota.c        |   16 ++++++++--------
 xlators/features/marker/src/marker-quota.h        |    2 +-
 xlators/features/marker/src/marker.c              |    2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/xlators/features/marker/src/marker-quota-helper.c
b/xlators/features/marker/src/marker-quota-helper.c
index fba2cdd..358531d 100644
--- a/xlators/features/marker/src/marker-quota-helper.c
+++ b/xlators/features/marker/src/marker-quota-helper.c
@@ -28,7 +28,7 @@
 #include "marker-mem-types.h"

 int
-quota_loc_fill (loc_t *loc, inode_t *inode, inode_t *parent, char *path)
+mquota_loc_fill (loc_t *loc, inode_t *inode, inode_t *parent, char *path)
 {
         int ret = -1;

@@ -65,7 +65,7 @@ loc_wipe:


 int32_t
-quota_inode_loc_fill (const char *parent_gfid, inode_t *inode, loc_t *loc)
+mquota_inode_loc_fill (const char *parent_gfid, inode_t *inode, loc_t *loc)
 {
         char            *resolvedpath = NULL;
         inode_t         *parent       = NULL;
@@ -93,7 +93,7 @@ ignore_parent:
         if (ret < 0)
                 goto err;

-        ret = quota_loc_fill (loc, inode, parent, resolvedpath);
+        ret = mquota_loc_fill (loc, inode, parent, resolvedpath);
         if (ret < 0)
                 goto err;

@@ -314,7 +314,7 @@ quota_inode_ctx_new (inode_t * inode, xlator_t *this)
 }

 quota_local_t *
-quota_local_new ()
+mquota_local_new ()
 {
         int32_t         ret     = -1;
         quota_local_t  *local   = NULL;
diff --git a/xlators/features/marker/src/marker-quota-helper.h
b/xlators/features/marker/src/marker-quota-helper.h
index 9a24c8c..6432351 100644
--- a/xlators/features/marker/src/marker-quota-helper.h
+++ b/xlators/features/marker/src/marker-quota-helper.h
@@ -60,10 +60,10 @@ int32_t
 delete_contribution_node (dict_t *, char *, inode_contribution_t *);

 int32_t
-quota_inode_loc_fill (const char *, inode_t *, loc_t *);
+mquota_inode_loc_fill (const char *, inode_t *, loc_t *);

 quota_local_t *
-quota_local_new ();
+mquota_local_new ();

 quota_local_t *
 quota_local_ref (quota_local_t *);
diff --git a/xlators/features/marker/src/marker-quota.c
b/xlators/features/marker/src/marker-quota.c
index 18d76dc..3464e2a 100644
--- a/xlators/features/marker/src/marker-quota.c
+++ b/xlators/features/marker/src/marker-quota.c
@@ -689,7 +689,7 @@ update_dirty_inode (xlator_t *this,

         mq_assign_lk_owner (this, frame);

-        local = quota_local_new ();
+        local = mquota_local_new ();
         if (local == NULL)
                 goto fr_destroy;

@@ -847,7 +847,7 @@ wind:
                 goto err;
         }

-        local = quota_local_new ();
+        local = mquota_local_new ();
         if (local == NULL)
                 goto free_size;

@@ -897,7 +897,7 @@ get_parent_inode_local (xlator_t *this,
quota_local_t *local)

         loc_wipe (&local->parent_loc);

-        quota_inode_loc_fill (NULL, local->loc.parent, &local->parent_loc);
+        mquota_inode_loc_fill (NULL, local->loc.parent,
&local->parent_loc);

         ret = quota_inode_ctx_get (local->loc.inode, this, &ctx);
         if (ret < 0)
@@ -1434,7 +1434,7 @@ start_quota_txn (xlator_t *this, loc_t *loc,

         mq_assign_lk_owner (this, frame);

-        local = quota_local_new ();
+        local = mquota_local_new ();
         if (local == NULL)
                 goto fr_destroy;

@@ -1444,7 +1444,7 @@ start_quota_txn (xlator_t *this, loc_t *loc,
         if (ret < 0)
                 goto fr_destroy;

-        ret = quota_inode_loc_fill (NULL, local->loc.parent,
+        ret = mquota_inode_loc_fill (NULL, local->loc.parent,
                                     &local->parent_loc);
         if (ret < 0)
                 goto fr_destroy;
@@ -1862,7 +1862,7 @@ reduce_parent_size (xlator_t *this, loc_t *loc)
         if (contribution == NULL)
                 goto out;

-        local = quota_local_new ();
+        local = mquota_local_new ();
         if (local == NULL) {
                 ret = -1;
                 goto out;
@@ -1875,7 +1875,7 @@ reduce_parent_size (xlator_t *this, loc_t *loc)
         local->ctx = ctx;
         local->contri = contribution;

-        ret = quota_inode_loc_fill (NULL, loc->parent, &local->parent_loc);
+        ret = mquota_inode_loc_fill (NULL, loc->parent,
&local->parent_loc);
         if (ret < 0)
                 goto out;

@@ -1946,7 +1946,7 @@ out:
 }

 int32_t
-quota_forget (xlator_t *this, quota_inode_ctx_t *ctx)
+mquota_forget (xlator_t *this, quota_inode_ctx_t *ctx)
 {
         inode_contribution_t *contri = NULL;
         inode_contribution_t *next   = NULL;
diff --git a/xlators/features/marker/src/marker-quota.h
b/xlators/features/marker/src/marker-quota.h
index 802c1d9..d8b2091 100644
--- a/xlators/features/marker/src/marker-quota.h
+++ b/xlators/features/marker/src/marker-quota.h
@@ -166,5 +166,5 @@ int32_t
 inspect_file_xattr (xlator_t *this, loc_t *loc, dict_t *dict, struct
iatt buf);

 int32_t
-quota_forget (xlator_t *, quota_inode_ctx_t *);
+mquota_forget (xlator_t *, quota_inode_ctx_t *);
 #endif
diff --git a/xlators/features/marker/src/marker.c
b/xlators/features/marker/src/marker.c
index f3c9e33..2a0055f 100644
--- a/xlators/features/marker/src/marker.c
+++ b/xlators/features/marker/src/marker.c
@@ -2035,7 +2035,7 @@ marker_forget (xlator_t *this, inode_t *inode)
                 goto out;
         }

-        quota_forget (this, ctx->quota_ctx);
+        mquota_forget (this, ctx->quota_ctx);

         GF_FREE (ctx);
 out:
--
1.7.3.4