diff options
author | shishir gowda <sgowda@redhat.com> | 2013-11-15 14:53:44 +0530 |
---|---|---|
committer | shishir gowda <sgowda@redhat.com> | 2013-11-15 14:53:44 +0530 |
commit | f0503527548a13cd1af2db640488b4c01857fc4d (patch) | |
tree | f8dcccb2d0d824ba1b81c5bb4b293359a10b6d56 /xlators/mgmt/glusterd/src/glusterd-store.c | |
parent | 6acf65e64cb6cd50b05ef8e60769ab3d5dc32ef7 (diff) |
snapshot: Merge conflict resolution
Signed-off-by: shishir gowda <sgowda@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-store.c')
-rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-store.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c index 7a0b7fc90..7ad63bde5 100644 --- a/xlators/mgmt/glusterd/src/glusterd-store.c +++ b/xlators/mgmt/glusterd/src/glusterd-store.c @@ -694,6 +694,11 @@ glusterd_volume_exclude_options_write (int fd, glusterd_volinfo_t *volinfo) if (ret) goto out; } + snprintf (buf, sizeof (buf), "%"PRIu64, volinfo->snap_max_limit); + ret = gf_store_save_value (fd, GLUSTERD_STORE_KEY_SNAP_MAX_LIMIT, + buf); + if (ret) + goto out; out: if (ret) @@ -1698,11 +1703,7 @@ glusterd_store_volinfo_atomic_update (glusterd_volinfo_t *volinfo) ret = gf_store_rename_tmppath (volinfo->shandle); if (ret) goto out; - snprintf (buf, sizeof (buf), "%"PRIu64, volinfo->snap_max_limit); - ret = gf_store_save_value (fd, GLUSTERD_STORE_KEY_SNAP_MAX_LIMIT, - buf); - if (ret) - goto out; + out: if (ret) gf_log (THIS->name, GF_LOG_ERROR, "Couldn't rename " |