diff options
author | Jeff Darcy <jdarcy@redhat.com> | 2014-03-24 20:44:07 +0000 |
---|---|---|
committer | Jeff Darcy <jdarcy@redhat.com> | 2014-03-24 20:44:07 +0000 |
commit | efbb23837761bda6c526baca1b5ea72d227e2ae3 (patch) | |
tree | 728199c73595103d7561dd9d441bdbe1845c6331 /libglusterfs/src/xlator.c | |
parent | a58b023443b7a2ec089c45bf35bde2b0108aa19b (diff) | |
parent | 17454dfea9f3c4d47fcf0b5370a6155f639c8aeb (diff) |
Merge branch 'upstream'
Diffstat (limited to 'libglusterfs/src/xlator.c')
-rw-r--r-- | libglusterfs/src/xlator.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libglusterfs/src/xlator.c b/libglusterfs/src/xlator.c index da62db0a5..55e946795 100644 --- a/libglusterfs/src/xlator.c +++ b/libglusterfs/src/xlator.c @@ -681,7 +681,9 @@ loc_copy_overload_parent (loc_t *dst, loc_t *src, inode_t *parent) dst->name = strrchr (dst->path, '/'); if (dst->name) dst->name++; - } + } else if (src->name) { + dst->name = src->name; + } ret = 0; out: @@ -719,7 +721,9 @@ loc_copy (loc_t *dst, loc_t *src) dst->name = strrchr (dst->path, '/'); if (dst->name) dst->name++; - } + } else if (src->name) { + dst->name = src->name; + } ret = 0; out: |