diff options
| author | Amar Tumballi <amarts@redhat.com> | 2012-05-21 14:13:05 +0530 |
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2012-05-21 04:48:44 -0700 |
| commit | 4da1b231c3333806cec16321efa45cc410359574 (patch) | |
| tree | 87b09eaffc62297c61ee068b1b491b4ed5f13386 | |
| parent | 4746ed1a055c595f08445d5a670e9585f8209183 (diff) | |
protocol/client: free the 'loc2' variable of client_local
in common client_local_wipe(), local->loc2 was not getting freed
up, but its used in few functions for logging purpose.
Change-Id: I05715843b59aa216a79f5164a152c605dc9ad114
Signed-off-by: Amar Tumballi <amarts@redhat.com>
BUG: 823133
Reviewed-on: http://review.gluster.com/3389
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-volgen.c | 4 | ||||
| -rw-r--r-- | xlators/protocol/client/src/client-helpers.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index 043f6146b21..9d05a93cb31 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -220,9 +220,9 @@ static struct volopt_map_entry glusterd_volopt_map[] = { {VKEY_FEATURES_LIMIT_USAGE, "features/quota", "limit-set", NULL, NO_DOC, 0}, {"features.quota-timeout", "features/quota", "timeout", "0", DOC, 0}, {"server.statedump-path", "protocol/server", "statedump-path", NULL, DOC, 0}, - {"features.lock-heal", "protocol/client", "lk-heal", NULL, DOC, 0}, + {"features.lock-heal", "protocol/client", "lk-heal", NULL, NO_DOC, 0}, {"features.lock-heal", "protocol/server", "lk-heal", NULL, DOC, 0}, - {"features.grace-timeout", "protocol/client", "grace-timeout", NULL, DOC, 0}, + {"features.grace-timeout", "protocol/client", "grace-timeout", NULL, NO_DOC, 0}, {"features.grace-timeout", "protocol/server", "grace-timeout", NULL, DOC, 0}, {"feature.read-only", "features/read-only", "!read-only", "off", DOC, 0}, {NULL, } diff --git a/xlators/protocol/client/src/client-helpers.c b/xlators/protocol/client/src/client-helpers.c index 3efadeae265..a0a006123e1 100644 --- a/xlators/protocol/client/src/client-helpers.c +++ b/xlators/protocol/client/src/client-helpers.c @@ -123,6 +123,7 @@ client_local_wipe (clnt_local_t *local) { if (local) { loc_wipe (&local->loc); + loc_wipe (&local->loc2); if (local->fd) { fd_unref (local->fd); |