summaryrefslogtreecommitdiffstats
path: root/xlators/features/index
diff options
context:
space:
mode:
authorPranith Kumar K <pkarampu@redhat.com>2016-05-31 21:51:22 +0530
committerPranith Kumar Karampuri <pkarampu@redhat.com>2016-07-10 21:56:35 -0700
commitd3a93ff7a9a8d102cc13063dec33dd652d69d719 (patch)
tree1ebd89c68884bdb7b0ea485fd38427c3d9d90a97 /xlators/features/index
parent4dce874a7737fe527a0a611e16a764e1a86302e8 (diff)
features/index: Exclude gfid-type for '.', '..'
index_get_gfid_type is assuming all names are gfids where as some of these entry->d_names can be '.' or '..' Thanks a lot to Nithya for RC >BUG: 1336630 >Change-Id: I06ad688a5865ab25b4f6c8a91af8c7fb2ed62186 >Signed-off-by: Pranith Kumar K <pkarampu@redhat.com> >Reviewed-on: http://review.gluster.org/14589 >Smoke: Gluster Build System <jenkins@build.gluster.com> >NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> >CentOS-regression: Gluster Build System <jenkins@build.gluster.com> >Reviewed-by: Ravishankar N <ravishankar@redhat.com> >Reviewed-by: Krutika Dhananjay <kdhananj@redhat.com> >(cherry picked from commit a89a9d266c439800286f281655d67f4e362dec32) Change-Id: I2a3d13ee76846c38e965f8a98bacc8755a8debfd BUG: 1341482 Signed-off-by: Pranith Kumar K <pkarampu@redhat.com> Reviewed-on: http://review.gluster.org/14598 Smoke: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Krutika Dhananjay <kdhananj@redhat.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Tested-by: Oleksandr Natalenko <oleksandr@natalenko.name>
Diffstat (limited to 'xlators/features/index')
-rw-r--r--xlators/features/index/src/index.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/xlators/features/index/src/index.c b/xlators/features/index/src/index.c
index 84c22c0..5d59b22 100644
--- a/xlators/features/index/src/index.c
+++ b/xlators/features/index/src/index.c
@@ -1199,9 +1199,16 @@ index_get_gfid_type (void *opaque)
int ret = 0;
list_for_each_entry (entry, &args->entries->list, list) {
+ if (strcmp (entry->d_name, ".") == 0 ||
+ strcmp (entry->d_name, "..") == 0)
+ continue;
+
loc_wipe (&loc);
- gf_uuid_parse (entry->d_name, loc.gfid);
+
entry->d_type = IA_INVAL;
+ if (gf_uuid_parse (entry->d_name, loc.gfid))
+ continue;
+
loc.inode = inode_find (args->parent->table, loc.gfid);
if (loc.inode) {
entry->d_type = loc.inode->ia_type;