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

locks, stripe: check if dict is NULL before refing it

Browse Source 
Change-Id: Ifab58504280ed92e4435f7805052745e56bef5ef
BUG: 808003
Signed-off-by: Raghavendra Bhat <raghavendrabhat@gluster.com>
Reviewed-on: http://review.gluster.com/3073
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
This commit is contained in:
Raghavendra Bhat 2012-04-03 15:22:45 +05:30 committed by Vijay Bellur
parent 0e4c74861f
commit 3c5aed7d82
2 changed files with 8 additions and 4 deletions
xlators
cluster/stripe/src
stripe.c
features/locks/src
posix.c

9
xlators/cluster/stripe/src/stripe.c

@ -225,7 +225,8 @@ stripe_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
local->stbuf = *buf;
local->postparent = *postparent;
local->inode = inode_ref (inode);
local->xdata = dict_ref (xdata);
if (xdata)
local->xdata = dict_ref (xdata);
if (local->xattr) {
stripe_aggregate_xattr (local->xdata,
local->xattr);
@ -1848,7 +1849,8 @@ stripe_mkdir (call_frame_t *frame, xlator_t *this, loc_t *loc, mode_t mode,
}
local->op_ret = -1;
local->call_count = priv->child_count;
local->xdata = dict_ref (xdata);
if (xdata)
local->xdata = dict_ref (xdata);
local->mode = mode;
local->umask = umask;
loc_copy (&local->loc, loc);
@ -2297,7 +2299,8 @@ stripe_create (call_frame_t *frame, xlator_t *this, loc_t *loc,
local->flags = flags;
local->mode = mode;
local->umask = umask;
local->xattr = dict_ref (xdata);
if (xdata)
local->xattr = dict_ref (xdata);
local->call_count = priv->child_count;
/* Send a setxattr request to nodes where the

3
xlators/features/locks/src/posix.c

@ -272,7 +272,8 @@ pl_ftruncate (call_frame_t *frame, xlator_t *this,
local->op = FTRUNCATE;
local->offset = offset;
local->fd = fd_ref (fd);
local->xdata = dict_ref (xdata);
if (xdata)
local->xdata = dict_ref (xdata);
frame->local = local;