diff options
| author | Pavan Sondur <pavan@gluster.com> | 2010-10-02 06:14:33 +0000 |
|---|---|---|
| committer | Vijay Bellur <vijay@dev.gluster.com> | 2010-10-02 06:30:09 -0700 |
| commit | 73c6b2f21a67bed186a279adacb4eb28eafcd853 (patch) | |
| tree | b8a279cbdb603796bfb9c828e86f96583ab85bc3 /xlators/protocol/client/src/client-lk.c | |
| parent | 99ff5f22db3404abbbab6e7d7edabe930762118d (diff) | |
protocol/client: Fix dumping of locks in client.
Signed-off-by: Pavan Vilas Sondur <pavan@gluster.com>
Signed-off-by: Vijay Bellur <vijay@dev.gluster.com>
BUG: 865 (Add locks recovery support in GlusterFS)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=865
Diffstat (limited to 'xlators/protocol/client/src/client-lk.c')
| -rw-r--r-- | xlators/protocol/client/src/client-lk.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/xlators/protocol/client/src/client-lk.c b/xlators/protocol/client/src/client-lk.c index c5696500c..b6944ba40 100644 --- a/xlators/protocol/client/src/client-lk.c +++ b/xlators/protocol/client/src/client-lk.c @@ -914,20 +914,16 @@ client_dump_locks (char *name, inode_t *inode, dict_t *dict) { int ret = 0; + dict_t *new_dict = NULL; char dict_string[256]; + GF_ASSERT (dict); + new_dict = dict; + ret = dump_client_locks (inode); snprintf (dict_string, 256, "%d locks dumped in log file", ret); - dict = dict_new (); - if (!dict) { - gf_log (THIS->name, GF_LOG_DEBUG, - "Out of memory"); - ret = -1; - goto out; - } - - ret = dict_set_str (dict, "trusted.glusterfs.clientlk-dump", dict_string); + ret = dict_set_dynstr(new_dict, CLIENT_DUMP_LOCKS, dict_string); if (ret) { gf_log (THIS->name, GF_LOG_DEBUG, "Could not set dict with %s", CLIENT_DUMP_LOCKS); @@ -935,6 +931,7 @@ client_dump_locks (char *name, inode_t *inode, } out: + return ret; } |