summaryrefslogtreecommitdiffstats
path: root/xlators/cluster/dht/src/dht-layout.c
diff options
context:
space:
mode:
authorRaghavendra G <rgowdapp@redhat.com>2017-09-19 09:44:55 +0530
committerRaghavendra G <rgowdapp@redhat.com>2017-12-06 10:08:54 +0000
commitf85154306277fbd0510109dc67c9a85e67223028 (patch)
tree311caba1515008405dade2a307376c52eb644990 /xlators/cluster/dht/src/dht-layout.c
parentf4867128fe36e4521c56e4d1e8afd7ad1b3f621e (diff)
cluster/dht: populate inode in dentry for single subvolume dht
... in readdirp response if dentry points to a directory inode. This is a special case where the entire layout is stored in one single subvolume and hence no need for lookup to construct the layout >Change-Id: I44fd951e2393ec9dac2af120469be47081a32185 >BUG: 1492625 >Signed-off-by: Raghavendra G <rgowdapp@redhat.com> (cherry picked from commit 59d1cc720f52357f7a6f20bb630febc6a622c99c) Change-Id: I44fd951e2393ec9dac2af120469be47081a32185 BUG: 1478411 Signed-off-by: Raghavendra G <rgowdapp@redhat.com>
Diffstat (limited to 'xlators/cluster/dht/src/dht-layout.c')
-rw-r--r--xlators/cluster/dht/src/dht-layout.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/xlators/cluster/dht/src/dht-layout.c b/xlators/cluster/dht/src/dht-layout.c
index 3414dc91908..419ce329a1d 100644
--- a/xlators/cluster/dht/src/dht-layout.c
+++ b/xlators/cluster/dht/src/dht-layout.c
@@ -366,6 +366,9 @@ dht_layout_merge (xlator_t *this, dht_layout_t *layout, xlator_t *subvol,
err = op_errno;
}
+ if (!layout)
+ goto out;
+
for (i = 0; i < layout->cnt; i++) {
if (layout->list[i].xlator == NULL) {
layout->list[i].err = err;