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/features/shard/src/shard.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/features/shard/src/shard.c')
| -rw-r--r-- | xlators/features/shard/src/shard.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/xlators/features/shard/src/shard.c b/xlators/features/shard/src/shard.c index b8dc5bbf249..2a06f5b901b 100644 --- a/xlators/features/shard/src/shard.c +++ b/xlators/features/shard/src/shard.c @@ -1678,6 +1678,7 @@ shard_common_lookup_shards (call_frame_t *frame, xlator_t *this, inode_t *inode, bname = strrchr (path, '/') + 1; loc.inode = inode_new (this->itable); loc.parent = inode_ref (priv->dot_shard_inode); + gf_uuid_copy (loc.pargfid, priv->dot_shard_gfid); ret = inode_path (loc.parent, bname, (char **) &(loc.path)); if (ret < 0 || !(loc.inode)) { gf_msg (this->name, GF_LOG_ERROR, 0, |