diff options
| author | Kaushal M <kaushal@redhat.com> | 2016-11-18 15:32:08 +0530 |
|---|---|---|
| committer | Kaushal M <kaushal@redhat.com> | 2016-11-18 15:32:08 +0530 |
| commit | 94ba6c9995d3122f31cad2f4993ab07cd6ae7063 (patch) | |
| tree | 6d5612c63e43da29ac19ff8c28377bd99a8ff9a4 /xlators/cluster/afr/src/afr-common.c | |
| parent | c11131fcdf47c4f0144b0ee1709e8c4bb05dac08 (diff) | |
| parent | a4ecc73a5cd7029dd5ad4a8545a4ec41365ffce9 (diff) | |
Merge remote-tracking branch 'origin/release-3.7' into release-3.7
Due to a mistake done when tagging and pushing v3.7.17, v3.7.17 and
release-3.7 divereged, leaving the release-3.7 branch without the
v3.7.17 commit and tag. This merge resolves the divergence.
More information can about this is available in [1].
[1]: https://www.gluster.org/pipermail/maintainers/2016-November/001746.html
Diffstat (limited to 'xlators/cluster/afr/src/afr-common.c')
| -rw-r--r-- | xlators/cluster/afr/src/afr-common.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c index 24366d17ac1..923afc804be 100644 --- a/xlators/cluster/afr/src/afr-common.c +++ b/xlators/cluster/afr/src/afr-common.c @@ -2235,12 +2235,14 @@ afr_lookup_selfheal_wrap (void *opaque) afr_local_t *local = NULL; xlator_t *this = NULL; inode_t *inode = NULL; + uuid_t pargfid = {0,}; local = frame->local; this = frame->this; + loc_pargfid (&local->loc, pargfid); - ret = afr_selfheal_name (frame->this, local->loc.pargfid, - local->loc.name, &local->cont.lookup.gfid_req); + ret = afr_selfheal_name (frame->this, pargfid, local->loc.name, + &local->cont.lookup.gfid_req); if (ret == -EIO) goto unwind; |