diff options
| author | Amar Tumballi <amar@gluster.com> | 2012-01-17 05:57:24 +0530 | 
|---|---|---|
| committer | Anand Avati <avati@gluster.com> | 2012-01-25 02:24:20 -0800 | 
| commit | d7ecaaa1ed0f88869812ea17cb64a102a74c8c1c (patch) | |
| tree | 4293106362bf9dec2e6260a4062239a9b7340cc0 /xlators/cluster | |
| parent | 6c54022f1b1c7f5f458f6a7e783203d11e7f89b5 (diff) | |
core: add 'fremovexattr()' fop
so operations can be done on fd for extended attribute removal
Change-Id: Ie026f1b53793aeb4ae33e96ea5408c7a97f34bf6
Signed-off-by: Amar Tumballi <amar@gluster.com>
BUG: 766571
Reviewed-on: http://review.gluster.com/778
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@gluster.com>
Diffstat (limited to 'xlators/cluster')
| -rw-r--r-- | xlators/cluster/afr/src/afr-inode-write.c | 180 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr-inode-write.h | 4 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr.c | 1 | ||||
| -rw-r--r-- | xlators/cluster/dht/src/dht-common.c | 57 | ||||
| -rw-r--r-- | xlators/cluster/dht/src/dht-common.h | 4 | ||||
| -rw-r--r-- | xlators/cluster/dht/src/dht.c | 1 | 
6 files changed, 247 insertions, 0 deletions
diff --git a/xlators/cluster/afr/src/afr-inode-write.c b/xlators/cluster/afr/src/afr-inode-write.c index bb8b5f0fe5a..bd7746df347 100644 --- a/xlators/cluster/afr/src/afr-inode-write.c +++ b/xlators/cluster/afr/src/afr-inode-write.c @@ -1893,3 +1893,183 @@ out:          return 0;  } + +/* ffremovexattr */ +int +afr_fremovexattr_unwind (call_frame_t *frame, xlator_t *this) +{ +        afr_local_t *   local = NULL; +        call_frame_t   *main_frame = NULL; + +        local = frame->local; + +        LOCK (&frame->lock); +        { +                if (local->transaction.main_frame) +                        main_frame = local->transaction.main_frame; +                local->transaction.main_frame = NULL; +        } +        UNLOCK (&frame->lock); + +        if (main_frame) { +                AFR_STACK_UNWIND (fremovexattr, main_frame, +                                  local->op_ret, local->op_errno) +                        } +        return 0; +} + + +int +afr_fremovexattr_wind_cbk (call_frame_t *frame, void *cookie, xlator_t *this, +                          int32_t op_ret, int32_t op_errno) +{ +        afr_local_t *   local = NULL; +        afr_private_t * priv  = NULL; +        int call_count  = -1; +        int need_unwind = 0; + +        local = frame->local; +        priv = this->private; + +        LOCK (&frame->lock); +        { +                if (op_ret != -1) { +                        if (local->success_count == 0) { +                                local->op_ret = op_ret; +                        } +                        local->success_count++; + +                        if (local->success_count == priv->wait_count) { +                                need_unwind = 1; +                        } +                } + +                local->op_errno = op_errno; +        } +        UNLOCK (&frame->lock); + +        if (need_unwind) +                local->transaction.unwind (frame, this); + +        call_count = afr_frame_return (frame); + +        if (call_count == 0) { +                local->transaction.resume (frame, this); +        } + +        return 0; +} + + +int32_t +afr_fremovexattr_wind (call_frame_t *frame, xlator_t *this) +{ +        afr_local_t *local = NULL; +        afr_private_t *priv = NULL; +        int call_count = -1; +        int i = 0; + +        local = frame->local; +        priv = this->private; + +        call_count = afr_pre_op_done_children_count (local->transaction.pre_op, +                                                     priv->child_count); + +        if (call_count == 0) { +                local->transaction.resume (frame, this); +                return 0; +        } + +        local->call_count = call_count; + +        for (i = 0; i < priv->child_count; i++) { +                if (local->transaction.pre_op[i]) { +                        STACK_WIND_COOKIE (frame, afr_fremovexattr_wind_cbk, +                                           (void *) (long) i, +                                           priv->children[i], +                                           priv->children[i]->fops->fremovexattr, +                                           local->fd, +                                           local->cont.removexattr.name); + +                        if (!--call_count) +                                break; +                } +        } + +        return 0; +} + + +int +afr_fremovexattr_done (call_frame_t *frame, xlator_t *this) +{ +        afr_local_t * local = frame->local; + +        local->transaction.unwind (frame, this); + +        AFR_STACK_DESTROY (frame); + +        return 0; +} + + +int +afr_fremovexattr (call_frame_t *frame, xlator_t *this, +                  fd_t *fd, const char *name) +{ +        afr_private_t * priv  = NULL; +        afr_local_t   * local = NULL; +        call_frame_t   *transaction_frame = NULL; +        int ret = -1; +        int op_ret   = -1; +        int op_errno = 0; + +        VALIDATE_OR_GOTO (frame, out); +        VALIDATE_OR_GOTO (this, out); +        VALIDATE_OR_GOTO (this->private, out); + +        priv = this->private; + +        QUORUM_CHECK(fremovexattr, out); + +        transaction_frame = copy_frame (frame); +        if (!transaction_frame) { +                goto out; +        } + +        ALLOC_OR_GOTO (local, afr_local_t, out); + +        ret = afr_local_init (local, priv, &op_errno); +        if (ret < 0) { +                op_errno = -ret; +                goto out; +        } + +        transaction_frame->local = local; + +        local->op_ret = -1; + +        local->cont.removexattr.name = gf_strdup (name); + +        local->transaction.fop    = afr_fremovexattr_wind; +        local->transaction.done   = afr_fremovexattr_done; +        local->transaction.unwind = afr_fremovexattr_unwind; + +        local->fd = fd_ref (fd); + +        local->transaction.main_frame = frame; +        local->transaction.start   = LLONG_MAX - 1; +        local->transaction.len     = 0; + +        afr_transaction (transaction_frame, this, AFR_METADATA_TRANSACTION); + +        op_ret = 0; +out: +        if (op_ret == -1) { +                if (transaction_frame) +                        AFR_STACK_DESTROY (transaction_frame); +                AFR_STACK_UNWIND (fremovexattr, frame, op_ret, op_errno); +        } + +        return 0; +} diff --git a/xlators/cluster/afr/src/afr-inode-write.h b/xlators/cluster/afr/src/afr-inode-write.h index a2c3520f99f..bdd0b48669d 100644 --- a/xlators/cluster/afr/src/afr-inode-write.h +++ b/xlators/cluster/afr/src/afr-inode-write.h @@ -73,4 +73,8 @@ int32_t  afr_removexattr (call_frame_t *frame, xlator_t *this,  		 loc_t *loc, const char *name); +int32_t +afr_fremovexattr (call_frame_t *frame, xlator_t *this, +                  fd_t *fd, const char *name); +  #endif /* __INODE_WRITE_H__ */ diff --git a/xlators/cluster/afr/src/afr.c b/xlators/cluster/afr/src/afr.c index 22be68a65e4..efb1742ea7e 100644 --- a/xlators/cluster/afr/src/afr.c +++ b/xlators/cluster/afr/src/afr.c @@ -400,6 +400,7 @@ struct xlator_fops fops = {          .setattr     = afr_setattr,          .fsetattr    = afr_fsetattr,          .removexattr = afr_removexattr, +        .fremovexattr = afr_fremovexattr,          /* dir read */          .opendir     = afr_opendir, diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c index a16ed7b6c50..c26ff95974d 100644 --- a/xlators/cluster/dht/src/dht-common.c +++ b/xlators/cluster/dht/src/dht-common.c @@ -2311,6 +2311,63 @@ err:          return 0;  } +int +dht_fremovexattr (call_frame_t *frame, xlator_t *this, +                  fd_t *fd, const char *key) +{ +        xlator_t     *subvol = NULL; +        int           op_errno = -1; +        dht_local_t  *local = NULL; +        dht_layout_t *layout = NULL; +        int           call_cnt = 0; + +        int i; + +        VALIDATE_OR_GOTO (frame, err); +        VALIDATE_OR_GOTO (this, err); + +        local = dht_local_init (frame, NULL, fd, GF_FOP_FREMOVEXATTR); +        if (!local) { +                op_errno = ENOMEM; +                goto err; +        } + +        subvol = local->cached_subvol; +        if (!subvol) { +                gf_log (this->name, GF_LOG_DEBUG, +                        "no cached subvolume for inode=%s", +                        uuid_utoa (fd->inode->gfid)); +                op_errno = EINVAL; +                goto err; +        } + +        layout = local->layout; +        if (!local->layout) { +                gf_log (this->name, GF_LOG_DEBUG, +                        "no layout for inode=%s", uuid_utoa (fd->inode->gfid)); +                op_errno = EINVAL; +                goto err; +        } + +        local->call_cnt = call_cnt = layout->cnt; +        local->key = gf_strdup (key); + +        for (i = 0; i < call_cnt; i++) { +                STACK_WIND (frame, dht_removexattr_cbk, +                            layout->list[i].xlator, +                            layout->list[i].xlator->fops->fremovexattr, +                            fd, key); +        } + +        return 0; + +err: +        op_errno = (op_errno == -1) ? errno : op_errno; +        DHT_STACK_UNWIND (fremovexattr, frame, -1, op_errno); + +        return 0; +} +  int  dht_fd_cbk (call_frame_t *frame, void *cookie, xlator_t *this, diff --git a/xlators/cluster/dht/src/dht-common.h b/xlators/cluster/dht/src/dht-common.h index 8a0765b63f9..ef78892eb04 100644 --- a/xlators/cluster/dht/src/dht-common.h +++ b/xlators/cluster/dht/src/dht-common.h @@ -524,6 +524,10 @@ int32_t dht_removexattr (call_frame_t   *frame,                           xlator_t   *this,                           loc_t      *loc,                           const char *name); +int32_t dht_fremovexattr (call_frame_t   *frame, +                          xlator_t   *this, +                          fd_t      *fd, +                          const char *name);  int32_t dht_lk (call_frame_t        *frame,                  xlator_t        *this, diff --git a/xlators/cluster/dht/src/dht.c b/xlators/cluster/dht/src/dht.c index 8be573f5165..ca79910d30b 100644 --- a/xlators/cluster/dht/src/dht.c +++ b/xlators/cluster/dht/src/dht.c @@ -486,6 +486,7 @@ struct xlator_fops fops = {          .lk          = dht_lk,          /* Inode write operations */ +        .fremovexattr = dht_fremovexattr,          .removexattr = dht_removexattr,          .setxattr    = dht_setxattr,          .fsetxattr   = dht_fsetxattr,  | 
