andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

features/trash: Retain file permissions during truncate

Browse Source 
Consider the situation where directory path for a truncated
file does not exists under trash directory. In this scenario
after creating the required path we failed to create the
orginal file with proper permissions. Eventhough we try to
fetch permissions from local->origpath, it was never filled
with required value in truncate and ftruncate call paths.
This change will copy original location to local->origpath
inside both fop handling functions.

Change-Id: If5930b6d368d08e58f04db999f3f9edb9250bcb9
BUG: 1309342
Signed-off-by: Anoop C S <anoopcs@redhat.com>
Reviewed-on: http://review.gluster.org/13461
Smoke: Gluster Build System <jenkins@build.gluster.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: jiffin tony Thottan <jthottan@redhat.com>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
This commit is contained in:
Anoop C S 2016-02-17 15:50:05 +05:30 committed by Jeff Darcy
parent 2102010eda
commit b1cb581424
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
xlators/features/trash/src/trash.c
View File

@ -1070,7 +1070,6 @@ trash_unlink (call_frame_t *frame, xlator_t *this, loc_t *loc, int xflags,
loc_copy (&local->loc, loc);
/* rename new location of file as starting from trash directory */
strcpy (local->origpath, pathbuf);
copy_trash_path (priv->newtrash_dir, (frame->root->pid < 0),
local->newpath);
strcat (local->newpath, pathbuf);
@ -1722,6 +1721,8 @@ trash_truncate (call_frame_t *frame, xlator_t *this, loc_t *loc,
goto out;
}
strcpy (local->origpath, pathbuf);
loc_copy (&local->loc, loc);
local->loc.path = pathbuf;
local->fop_offset = offset;
@ -1816,6 +1817,8 @@ trash_ftruncate (call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset,
goto out;
}
strcpy (local->origpath, pathbuf);
/* To convert fd to location */
frame->local=local;