diff options
Diffstat (limited to 'xlators/cluster/dht/src/dht-rename.c')
| -rw-r--r-- | xlators/cluster/dht/src/dht-rename.c | 72 | 
1 files changed, 40 insertions, 32 deletions
diff --git a/xlators/cluster/dht/src/dht-rename.c b/xlators/cluster/dht/src/dht-rename.c index fa06de71175..af8f5077469 100644 --- a/xlators/cluster/dht/src/dht-rename.c +++ b/xlators/cluster/dht/src/dht-rename.c @@ -35,7 +35,8 @@ int  dht_rename_dir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,                      int32_t op_ret, int32_t op_errno, struct iatt *stbuf,                      struct iatt *preoldparent, struct iatt *postoldparent, -                    struct iatt *prenewparent, struct iatt *postnewparent) +                    struct iatt *prenewparent, struct iatt *postnewparent, +                    dict_t *xdata)  {          dht_local_t  *local = NULL;          int           this_call_cnt = 0; @@ -84,7 +85,7 @@ unwind:                  DHT_STACK_UNWIND (rename, frame, local->op_ret, local->op_errno,                                    &local->stbuf, &local->preoldparent,                                    &local->postoldparent, -                                  &local->preparent, &local->postparent); +                                  &local->preparent, &local->postparent, xdata);          }          return 0; @@ -97,7 +98,7 @@ dht_rename_hashed_dir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,                             struct iatt *preoldparent,                             struct iatt *postoldparent,                             struct iatt *prenewparent, -                           struct iatt *postnewparent) +                           struct iatt *postnewparent, dict_t *xdata)  {          dht_conf_t   *conf = NULL;          dht_local_t  *local = NULL; @@ -147,7 +148,7 @@ dht_rename_hashed_dir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,                  STACK_WIND (frame, dht_rename_dir_cbk,                              conf->subvolumes[i],                              conf->subvolumes[i]->fops->rename, -                            &local->loc, &local->loc2); +                            &local->loc, &local->loc2, NULL);                  if (!--call_cnt)                          break;          } @@ -164,7 +165,7 @@ unwind:          DHT_STACK_UNWIND (rename, frame, local->op_ret, local->op_errno,                            &local->stbuf, &local->preoldparent,                            &local->postoldparent, -                          &local->preparent, &local->postparent); +                          &local->preparent, &local->postparent, NULL);          return 0;  } @@ -185,19 +186,20 @@ dht_rename_dir_do (call_frame_t *frame, xlator_t *this)          STACK_WIND (frame, dht_rename_hashed_dir_cbk,                      local->dst_hashed,                      local->dst_hashed->fops->rename, -                    &local->loc, &local->loc2); +                    &local->loc, &local->loc2, NULL);          return 0;  err:          DHT_STACK_UNWIND (rename, frame, local->op_ret, local->op_errno, NULL, NULL, -                          NULL, NULL, NULL); +                          NULL, NULL, NULL, NULL);          return 0;  }  int  dht_rename_readdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, -                        int op_ret, int op_errno, gf_dirent_t *entries) +                        int op_ret, int op_errno, gf_dirent_t *entries, +                        dict_t *xdata)  {          dht_local_t  *local = NULL;          int           this_call_cnt = -1; @@ -226,7 +228,7 @@ dht_rename_readdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,  int  dht_rename_opendir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, -                        int op_ret, int op_errno, fd_t *fd) +                        int op_ret, int op_errno, fd_t *fd, dict_t *xdata)  {          dht_local_t  *local = NULL;          int           this_call_cnt = -1; @@ -246,7 +248,7 @@ dht_rename_opendir_cbk (call_frame_t *frame, void *cookie, xlator_t *this,          STACK_WIND (frame, dht_rename_readdir_cbk,                      prev->this, prev->this->fops->readdir, -                    local->fd, 4096, 0); +                    local->fd, 4096, 0, NULL);          return 0; @@ -302,14 +304,15 @@ dht_rename_dir (call_frame_t *frame, xlator_t *this)                  STACK_WIND (frame, dht_rename_opendir_cbk,                              conf->subvolumes[i],                              conf->subvolumes[i]->fops->opendir, -                            &local->loc2, local->fd); +                            &local->loc2, local->fd, NULL);          }          return 0;  err:          op_errno = (op_errno == -1) ? errno : op_errno; -        DHT_STACK_UNWIND (rename, frame, -1, op_errno, NULL, NULL, NULL, NULL, NULL); +        DHT_STACK_UNWIND (rename, frame, -1, op_errno, NULL, NULL, NULL, NULL, +                          NULL, NULL);          return 0;  } @@ -317,7 +320,7 @@ err:  int  dht_rename_unlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this,                         int32_t op_ret, int32_t op_errno, struct iatt *preparent, -                       struct iatt *postparent) +                       struct iatt *postparent, dict_t *xdata)  {          dht_local_t  *local = NULL;          call_frame_t *prev = NULL; @@ -350,7 +353,7 @@ dht_rename_unlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this,                  DHT_STACK_UNWIND (rename, frame, local->op_ret, local->op_errno,                                    &local->stbuf, &local->preoldparent,                                    &local->postoldparent, &local->preparent, -                                  &local->postparent); +                                  &local->postparent, NULL);          }  out: @@ -398,7 +401,7 @@ dht_rename_cleanup (call_frame_t *frame)                          local->loc.path, dst_hashed->name, src_cached->name);                  STACK_WIND (frame, dht_rename_unlink_cbk,                              dst_hashed, dst_hashed->fops->unlink, -                            &local->loc); +                            &local->loc, 0, NULL);          }          if (src_cached != dst_hashed) { @@ -407,7 +410,7 @@ dht_rename_cleanup (call_frame_t *frame)                          local->loc2.path, src_cached->name);                  STACK_WIND (frame, dht_rename_unlink_cbk,                              src_cached, src_cached->fops->unlink, -                            &local->loc2); +                            &local->loc2, 0, NULL);          }          return 0; @@ -422,7 +425,7 @@ nolinks:          DHT_STACK_UNWIND (rename, frame, local->op_ret, local->op_errno,                            &local->stbuf, &local->preoldparent,                            &local->postoldparent, &local->preparent, -                          &local->postparent); +                          &local->postparent, NULL);          return 0;  } @@ -430,9 +433,10 @@ nolinks:  int  dht_rename_links_create_cbk (call_frame_t *frame, void *cookie, xlator_t *this, -                      int32_t op_ret, int32_t op_errno, -                      inode_t *inode, struct iatt *stbuf, -                      struct iatt *preparent, struct iatt *postparent) +                             int32_t op_ret, int32_t op_errno, +                             inode_t *inode, struct iatt *stbuf, +                             struct iatt *preparent, struct iatt *postparent, +                             dict_t *xdata)  {          call_frame_t *prev = NULL;          dht_local_t  *local = NULL; @@ -456,7 +460,8 @@ int  dht_rename_cbk (call_frame_t *frame, void *cookie, xlator_t *this,                  int32_t op_ret, int32_t op_errno, struct iatt *stbuf,                  struct iatt *preoldparent, struct iatt *postoldparent, -                struct iatt *prenewparent, struct iatt *postnewparent) +                struct iatt *prenewparent, struct iatt *postnewparent, +                dict_t *xdata)  {          dht_local_t  *local = NULL;          call_frame_t *prev = NULL; @@ -545,7 +550,7 @@ err:                  STACK_WIND (frame, dht_rename_unlink_cbk,                              src_cached, src_cached->fops->unlink, -                            &local->loc); +                            &local->loc, 0, NULL);          }          if (src_hashed != rename_subvol && src_hashed != src_cached) { @@ -555,7 +560,7 @@ err:                  STACK_WIND (frame, dht_rename_unlink_cbk,                              src_hashed, src_hashed->fops->unlink, -                            &local->loc); +                            &local->loc, 0, NULL);          }          if (dst_cached @@ -567,7 +572,7 @@ err:                  STACK_WIND (frame, dht_rename_unlink_cbk,                              dst_cached, dst_cached->fops->unlink, -                            &local->loc2); +                            &local->loc2, 0, NULL);          }          return 0; @@ -581,7 +586,7 @@ unwind:          DHT_STACK_UNWIND (rename, frame, local->op_ret, local->op_errno,                            &local->stbuf, &local->preoldparent,                            &local->postoldparent, &local->preparent, -                          &local->postparent); +                          &local->postparent, NULL);          return 0; @@ -621,7 +626,7 @@ dht_do_rename (call_frame_t *frame)          STACK_WIND (frame, dht_rename_cbk,                      rename_subvol, rename_subvol->fops->rename, -                    &local->loc, &local->loc2); +                    &local->loc, &local->loc2, NULL);          return 0;  } @@ -631,7 +636,8 @@ int  dht_rename_links_cbk (call_frame_t *frame, void *cookie, xlator_t *this,                        int32_t op_ret, int32_t op_errno,                        inode_t *inode, struct iatt *stbuf, -                      struct iatt *preparent, struct iatt *postparent) +                      struct iatt *preparent, struct iatt *postparent, +                      dict_t *xdata)  {          dht_local_t  *local = NULL;          call_frame_t *prev = NULL; @@ -670,7 +676,8 @@ cleanup:  int  dht_rename_unlink_links_cbk (call_frame_t *frame, void *cookie, xlator_t *this,                               int32_t op_ret, int32_t op_errno, -                             struct iatt *preparent, struct iatt *postparent) +                             struct iatt *preparent, struct iatt *postparent, +                             dict_t *xdata)  {  	dht_local_t  *local = NULL;  	call_frame_t *prev = NULL; @@ -733,7 +740,7 @@ dht_rename_create_links (call_frame_t *frame)  		STACK_WIND (frame, dht_rename_unlink_links_cbk,  			    dst_hashed, dst_hashed->fops->unlink, -			    &local->loc2); +			    &local->loc2, 0, NULL);                  return 0;          } @@ -760,7 +767,7 @@ dht_rename_create_links (call_frame_t *frame)  			local->loc2.path, src_cached->name);  		STACK_WIND (frame, dht_rename_links_cbk,  			    src_cached, src_cached->fops->link, -			    &local->loc, &local->loc2); +			    &local->loc, &local->loc2, NULL);  	}  nolinks: @@ -775,7 +782,7 @@ nolinks:  int  dht_rename (call_frame_t *frame, xlator_t *this, -            loc_t *oldloc, loc_t *newloc) +            loc_t *oldloc, loc_t *newloc, dict_t *xdata)  {          xlator_t    *src_cached = NULL;          xlator_t    *src_hashed = NULL; @@ -857,7 +864,8 @@ dht_rename (call_frame_t *frame, xlator_t *this,  err:          op_errno = (op_errno == -1) ? errno : op_errno; -        DHT_STACK_UNWIND (rename, frame, -1, op_errno, NULL, NULL, NULL, NULL, NULL); +        DHT_STACK_UNWIND (rename, frame, -1, op_errno, NULL, NULL, NULL, NULL, +                          NULL, NULL);          return 0;  }  | 
