diff options
| -rw-r--r-- | xlators/experimental/jbr-server/src/all-templates.c | 7 | ||||
| -rw-r--r-- | xlators/experimental/jbr-server/src/jbr.c | 1 | 
2 files changed, 3 insertions, 5 deletions
diff --git a/xlators/experimental/jbr-server/src/all-templates.c b/xlators/experimental/jbr-server/src/all-templates.c index 7314701029c..0fb96ac0436 100644 --- a/xlators/experimental/jbr-server/src/all-templates.c +++ b/xlators/experimental/jbr-server/src/all-templates.c @@ -165,7 +165,6 @@ jbr_@NAME@_call_dispatch (call_frame_t *frame, xlator_t *this, int *op_errno,          jbr_local_t     *local  = NULL;          jbr_private_t   *priv   = NULL;          int32_t          ret    = -1; -        xlator_list_t   *trav   = NULL;          GF_VALIDATE_OR_GOTO ("jbr", this, out);          priv = this->private; @@ -308,7 +307,6 @@ int32_t  jbr_@NAME@_continue (call_frame_t *frame, xlator_t *this,                       @LONG_ARGS@)  { -        int32_t          ret = -1;          gf_boolean_t     result   = _gf_false;          jbr_local_t     *local    = NULL;          jbr_private_t   *priv     = NULL; @@ -340,9 +338,8 @@ jbr_@NAME@_continue (call_frame_t *frame, xlator_t *this,                              @SHORT_ARGS@);          } -        ret = 0;  out: -        return ret; +        return 0;  }  /* template-name write-complete */ @@ -351,7 +348,9 @@ jbr_@NAME@_complete (call_frame_t *frame, void *cookie, xlator_t *this,                       int32_t op_ret, int32_t op_errno,                       @LONG_ARGS@)  { +#if defined(JBR_CG_QUEUE)          int32_t          ret       = -1; +#endif          gf_boolean_t     result    = _gf_false;          jbr_private_t   *priv      = NULL;          jbr_local_t     *local     = NULL; diff --git a/xlators/experimental/jbr-server/src/jbr.c b/xlators/experimental/jbr-server/src/jbr.c index cd9e71a9ea3..926b5b3c742 100644 --- a/xlators/experimental/jbr-server/src/jbr.c +++ b/xlators/experimental/jbr-server/src/jbr.c @@ -287,7 +287,6 @@ out:  int32_t  jbr_initialize_xdata_set_attrs (xlator_t *this, dict_t **xdata)  { -        jbr_local_t     *local         = NULL;          jbr_private_t   *priv          = NULL;          int32_t          ret           = -1;          uint32_t         ti            = 0;  | 
