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 /libglusterfs/src/xlator.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 'libglusterfs/src/xlator.c')
| -rw-r--r-- | libglusterfs/src/xlator.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/libglusterfs/src/xlator.c b/libglusterfs/src/xlator.c index 22a494d01a5..5c91380be15 100644 --- a/libglusterfs/src/xlator.c +++ b/libglusterfs/src/xlator.c @@ -762,6 +762,23 @@ out: return; } +void +loc_pargfid (loc_t *loc, uuid_t gfid) +{ + if (!gfid) + goto out; + gf_uuid_clear (gfid); + + if (!loc) + goto out; + else if (!gf_uuid_is_null (loc->pargfid)) + gf_uuid_copy (gfid, loc->pargfid); + else if (loc->parent && (!gf_uuid_is_null (loc->parent->gfid))) + gf_uuid_copy (gfid, loc->parent->gfid); +out: + return; +} + char* loc_gfid_utoa (loc_t *loc) { |