diff options
| author | Pranith Kumar K <pkarampu@redhat.com> | 2015-06-02 16:39:35 +0530 |
|---|---|---|
| committer | Raghavendra G <rgowdapp@redhat.com> | 2015-10-05 23:11:02 -0700 |
| commit | c3dd76e9da783d879258cde17680f7d8747506f8 (patch) | |
| tree | a839bcfd5de5375f83f9bad5bb8f8f316ebe5a3d /xlators/encryption | |
| parent | df06d94fae1e4a5e93f00c26d4b377bd8d1bd352 (diff) | |
fd: Do fd_bind on successful open
- fd_unref should decrement fd->inode->fd_count only if it is present in the
inode's fd list.
- successful open/opendir should perform fd_bind.
>Change-Id: I81dd04f330e2fee86369a6dc7147af44f3d49169
>BUG: 1207735
>Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
>Reviewed-on: http://review.gluster.org/11044
>Reviewed-by: Anoop C S <anoopcs@redhat.com>
>Tested-by: NetBSD Build System <jenkins@build.gluster.org>
>Tested-by: Gluster Build System <jenkins@build.gluster.com>
>Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
BUG: 1259697
Change-Id: I73b79dd3519aa085fb84dde74b321511cbccce1a
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Reviewed-on: http://review.gluster.org/12100
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Raghavendra G <rgowdapp@redhat.com>
Diffstat (limited to 'xlators/encryption')
| -rw-r--r-- | xlators/encryption/crypt/src/crypt.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/xlators/encryption/crypt/src/crypt.c b/xlators/encryption/crypt/src/crypt.c index 5387f84303c..57ae72731ba 100644 --- a/xlators/encryption/crypt/src/crypt.c +++ b/xlators/encryption/crypt/src/crypt.c @@ -1833,7 +1833,9 @@ static int32_t truncate_begin(call_frame_t *frame, op_ret, op_errno, NULL, NULL, NULL); return 0; - } + } else { + fd_bind (fd); + } /* * crypt_truncate() is implemented via crypt_ftruncate(), * so the crypt xlator does STACK_WIND to itself here @@ -3095,7 +3097,7 @@ static int32_t do_linkop(call_frame_t *frame, &lock, NULL); return 0; - error: + error: unwind_fn(frame); return 0; } @@ -3125,11 +3127,14 @@ static int32_t linkop_begin(call_frame_t *frame, unwind_fn = linkop_unwind_dispatch(local->fop); mop = linkop_mtdop_dispatch(local->fop); - if (op_ret < 0) + if (op_ret < 0) { /* * verification failed */ goto error; + } else { + fd_bind (fd); + } old_mtd = dict_get(xdata, CRYPTO_FORMAT_PREFIX); if (!old_mtd) { |