summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoseph Fernandes <josferna@redhat.com>2015-07-08 21:22:53 +0530
committerDan Lambright <dlambrig@redhat.com>2015-08-12 06:46:53 -0700
commita6243c3b1cbeb059da98a9260730fc9767fe8b44 (patch)
tree5008f9b2267872cb8debcb0488dd7bc7fdf7285e
parentb95d40bfd760525f0c3e1cf0a11a8087c17a7110 (diff)
libgfdb/ctr: Fixing rename or update of link
Backport of http://review.gluster.org/11584 to 3.7.2 Fixing rename or updating of link in 1) libgfdb : handling return from updatelink 2) ctr xlator: correcting freeing of oldbase name in hardlink list in the update link >Change-Id: I1789c492b81876123cd456051a9ae495e876ad46 >BUG: 1241054 >Signed-off-by: Joseph Fernandes <josferna@redhat.com> >Reviewed-on: http://review.gluster.org/11584 >Tested-by: Joseph Fernandes >Reviewed-by: Dan Lambright <dlambrig@redhat.com> >Tested-by: Dan Lambright <dlambrig@redhat.com> >Tested-by: Gluster Build System <jenkins@build.gluster.com> Signed-off-by: Joseph Fernandes <josferna@redhat.com> Change-Id: I6da86c06e390f62fe8a44ade7b1efda5771e9ca8 BUG: 1242536 Signed-off-by: Joseph Fernandes <josferna@redhat.com> Reviewed-on: http://review.gluster.org/11649 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Dan Lambright <dlambrig@redhat.com>
-rw-r--r--libglusterfs/src/gfdb/gfdb_sqlite3_helper.c2
-rw-r--r--xlators/features/changetimerecorder/src/ctr-xlator-ctx.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libglusterfs/src/gfdb/gfdb_sqlite3_helper.c b/libglusterfs/src/gfdb/gfdb_sqlite3_helper.c
index 40ee24c9627..68e0991bff2 100644
--- a/libglusterfs/src/gfdb/gfdb_sqlite3_helper.c
+++ b/libglusterfs/src/gfdb/gfdb_sqlite3_helper.c
@@ -829,7 +829,7 @@ gf_sql_insert_wind (gf_sql_connection_t *sql_conn,
"Creating gfid string failed.");
goto out;
}
- gf_sql_update_link (sql_conn, gfid_str,
+ ret = gf_sql_update_link (sql_conn, gfid_str,
pargfid_str,
gfdb_db_record->file_name,
gfdb_db_record->file_path,
diff --git a/xlators/features/changetimerecorder/src/ctr-xlator-ctx.c b/xlators/features/changetimerecorder/src/ctr-xlator-ctx.c
index b8f6f0301d9..b5a54c0b5e4 100644
--- a/xlators/features/changetimerecorder/src/ctr-xlator-ctx.c
+++ b/xlators/features/changetimerecorder/src/ctr-xlator-ctx.c
@@ -213,7 +213,7 @@ ctr_update_hard_link (xlator_t *this,
/* update the hard link */
gf_uuid_copy (ctr_hard_link->pgfid, pgfid);
- GF_FREE (&ctr_hard_link->base_name);
+ GF_FREE (ctr_hard_link->base_name);
ret = gf_asprintf(&ctr_hard_link->base_name, "%s", base_name);
if (ret < 0) {
gf_msg (this->name, GF_LOG_ERROR, 0,