glusterfs.git -

summary refs log tree commit diff stats

path: root/cli/src

diff options

author	Krishnan Parthasarathi <kparthas@redhat.com>	2012-08-28 17:29:53 +0530
committer	Vijay Bellur <vbellur@redhat.com>	2012-08-30 03:29:51 -0700
commit	50cb2c23e8e7bd1173572a21990dbdf545f09141 (patch)
tree	036ea4cc2188d4e916e4e3d59f864b390855493b /cli/src
parent	84298d77060772b91123d9cde9f0e6e4d9efc9ca (diff)

glusterd: Fixed incorrect assumptions in rpcsvc actors of glusterd

Signed-off-by: Krishnan Parthasarathi <kparthas@redhat.com> Reviewed-on: http://review.gluster.org/3864 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Anand Avati <avati@redhat.com> Conflicts: xlators/mgmt/glusterd/src/glusterd-handler.c Change-Id: Iabfcb401de9d658e32433aa1e8c87b329cbd2cf7 BUG: 851109 Signed-off-by: Krishnan Parthasarathi <kparthas@redhat.com> Reviewed-on: http://review.gluster.org/3876 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>

Diffstat (limited to 'cli/src')

0 files changed, 0 insertions, 0 deletions

rs/features/marker/src/marker-quota-helper.c
+++ b/xlators/features/marker/src/marker-quota-helper.c

@@ -32,8 +32,12 @@ quota_loc_fill (loc_t *loc, inode_t *inode, inode_t *parent, char *path)

{

int ret = -1;

- if (!loc)

- return ret;

+ GF_VALIDATE_OR_GOTO ("marker", loc, out);

+ GF_VALIDATE_OR_GOTO ("marker", inode, out);

+ GF_VALIDATE_OR_GOTO ("marker", path, out);

+ /* Not checking for parent because while filling

+ * loc of root, parent will be NULL

+ */

if (inode) {

loc->inode = inode_ref (inode);

@@ -59,7 +63,7 @@ quota_loc_fill (loc_t *loc, inode_t *inode, inode_t *parent, char *path)

loc_wipe:

if (ret < 0)

loc_wipe (loc);

-

+out:

return ret;

}

@@ -180,6 +184,7 @@ __add_new_contribution_node (xlator_t *this, quota_inode_ctx_t *ctx, loc_t *loc)

uuid_copy (contribution->gfid, loc->parent->gfid);

LOCK_INIT (&contribution->lock);

+ INIT_LIST_HEAD (&contribution->contri_list);

list_add_tail (&contribution->contri_list, &ctx->contribution_head);

@@ -363,7 +368,7 @@ quota_local_unref (xlator_t *this, quota_local_t *local)

QUOTA_SAFE_DECREMENT (&local->lock, local->ref, ref);

- if (ref > 0)

+ if (ref != 0)

goto out;

if (local->fd != NULL)

@@ -374,6 +379,8 @@ quota_local_unref (xlator_t *this, quota_local_t *local)

loc_wipe (&local->parent_loc);

LOCK_DESTROY (&local->lock);

+

+ GF_FREE (local);

out:

return 0;

}

diff --git a/xlators/features/marker/src/marker-quota.c b/xlators/features/marker/src/marker-quota.c
index cb50d71a7..5cb6dc9ad 100644
--- a/xlators/features/marker/src/marker-quota.c
+++ b/xlators/features/marker/src/marker-quota.c

@@ -30,6 +30,46 @@

#include "marker-quota.h"

#include "marker-quota-helper.h"

+int

+mq_loc_copy (loc_t *dst, loc_t *src)

+{

+ int ret = -1;

+

+ GF_VALIDATE_OR_GOTO ("marker", dst, out);

+ GF_VALIDATE_OR_GOTO ("marker", src, out);

+

+ if (src->inode == NULL ||

+ src->path ==