From f3b2305009b98de42c84e5b86668cf8b5f41e01f Mon Sep 17 00:00:00 2001 From: Krishnan Parthasarathi Date: Wed, 22 Feb 2012 15:07:03 +0530 Subject: pump: Fixed undefined reference to fill_loc_info fn. Changed function to pump_fill_loc_info since its use is relevant only in pump's context. Change-Id: I5be1a908f88328f732dacfd7eac18f0c62f49eb8 BUG: 796066 Signed-off-by: Krishnan Parthasarathi Reviewed-on: http://review.gluster.com/2796 Tested-by: Gluster Build System Reviewed-by: Pranith Kumar Karampuri Reviewed-by: Vijay Bellur --- xlators/cluster/afr/src/afr-self-heald.h | 3 --- xlators/cluster/afr/src/pump.c | 9 ++++++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/xlators/cluster/afr/src/afr-self-heald.h b/xlators/cluster/afr/src/afr-self-heald.h index 44fd9f38566..57b29ce2dc4 100644 --- a/xlators/cluster/afr/src/afr-self-heald.h +++ b/xlators/cluster/afr/src/afr-self-heald.h @@ -48,9 +48,6 @@ void afr_build_root_loc (xlator_t *this, loc_t *loc); int afr_set_root_gfid (dict_t *dict); -inline void -afr_fill_loc_info (loc_t *loc, struct iatt *iatt, struct iatt *parent); - void afr_do_poll_self_heal (void *data); diff --git a/xlators/cluster/afr/src/pump.c b/xlators/cluster/afr/src/pump.c index 18aee82ccef..cec8066e2e8 100644 --- a/xlators/cluster/afr/src/pump.c +++ b/xlators/cluster/afr/src/pump.c @@ -32,6 +32,13 @@ #include "glusterfs.h" static uint64_t pump_pid = 0; +static inline void +pump_fill_loc_info (loc_t *loc, struct iatt *iatt, struct iatt *parent) +{ + afr_update_loc_gfids (loc, iatt, parent); + uuid_copy (loc->inode->gfid, iatt->ia_gfid); +} + static int pump_mark_start_pending (xlator_t *this) { @@ -407,7 +414,7 @@ gf_pump_traverse_directory (loc_t *loc) entry_loc.path); continue; } - afr_fill_loc_info (&entry_loc, &iatt, + pump_fill_loc_info (&entry_loc, &iatt, &parent); pump_update_resume_state (this, entry_loc.path); -- cgit