diff options
| author | Michael Adam <obnox@samba.org> | 2015-03-31 13:47:21 +0200 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2015-03-31 23:52:04 -0700 |
| commit | ef5c3182224940f76d9290c1c4d9cc8e78fbdb83 (patch) | |
| tree | 210288c0ef0f38b4cf70a10876a4985a1c10b184 | |
| parent | 5c1ce6d29ee52af9daa23c1c7a54f23ce29a687e (diff) | |
features/trash: fix remove_trash_path in the internal case
In the internal case, copy_trash_path adds a second
path component "internal_op/", so remove_trash_path
should remove it again. Originally, remove_trash_path
did the same thing in the internal and non-internal case.
This patch fixes this problem.
Change-Id: If247d18217a2375d369672182f69a54881df26b9
BUG: 1207709
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-on: http://review.gluster.org/10073
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anoop C S <achiraya@redhat.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
| -rw-r--r-- | xlators/features/trash/src/trash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xlators/features/trash/src/trash.c b/xlators/features/trash/src/trash.c index c1d78602c4c..3a28815571e 100644 --- a/xlators/features/trash/src/trash.c +++ b/xlators/features/trash/src/trash.c @@ -126,7 +126,7 @@ remove_trash_path (const char *path, gf_boolean_t internal, char **rem_path) *rem_path = strchr (path + 1, '/'); if (internal) - *rem_path = strchr (path + 1, '/'); + *rem_path = strchr (*rem_path + 1, '/'); } /** |