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

features/marker: pass xdata in marker_unlink()

Browse Source 
Change-Id: Ia310af96b25f29351f3adc4bbc97aea271df7673
BUG: 987747
Signed-off-by: Venky Shankar <vshankar@redhat.com>
Reviewed-on: http://review.gluster.org/5379
Reviewed-by: Amar Tumballi <amarts@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
This commit is contained in:
Venky Shankar 2013-07-23 17:02:30 +05:30 committed by Vijay Bellur
parent a496f0fd94
commit aa04928a16
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xlators/features/marker/src/marker.c
View File

@ -185,6 +185,8 @@ marker_local_unref (marker_local_t *local)
loc_wipe (&local->loc);
loc_wipe (&local->parent_loc);
if (local->xdata)
dict_unref (local->xdata);
if (local->oplocal) {
marker_local_unref (local->oplocal);
@ -833,7 +835,7 @@ marker_unlink_stat_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
STACK_WIND (frame, marker_unlink_cbk, FIRST_CHILD(this),
FIRST_CHILD(this)->fops->unlink, &local->loc, local->xflag,
NULL);
local->xdata);
return 0;
err:
frame->local = NULL;
@ -858,6 +860,8 @@ marker_unlink (call_frame_t *frame, xlator_t *this, loc_t *loc, int xflag,
local = mem_get0 (this->local_pool);
local->xflag = xflag;
if (xdata)
local->xdata = dict_ref (xdata);
MARKER_INIT_LOCAL (frame, local);
ret = loc_copy (&local->loc, loc);

1
xlators/features/marker/src/marker.h
View File

@ -110,6 +110,7 @@ struct marker_local{
inode_contribution_t *contri;
int xflag;
dict_t *xdata;
};
typedef struct marker_local marker_local_t;