diff options
| -rw-r--r-- | libglusterfs/src/inode.h | 1 | ||||
| -rw-r--r-- | tests/basic/afr/split-brain-healing.t | 1 | ||||
| -rw-r--r-- | xlators/cluster/dht/src/dht-common.c | 4 | ||||
| -rw-r--r-- | xlators/performance/readdir-ahead/src/readdir-ahead-mem-types.h | 1 | ||||
| -rw-r--r-- | xlators/performance/readdir-ahead/src/readdir-ahead.c | 576 | ||||
| -rw-r--r-- | xlators/performance/readdir-ahead/src/readdir-ahead.h | 39 |
6 files changed, 22 insertions, 600 deletions
diff --git a/libglusterfs/src/inode.h b/libglusterfs/src/inode.h index 96f67c05629..ffee2a5516a 100644 --- a/libglusterfs/src/inode.h +++ b/libglusterfs/src/inode.h @@ -260,7 +260,6 @@ inode_ctx_put(inode_t *inode, xlator_t *this, uint64_t v) #define inode_ctx_get(i,x,v) inode_ctx_get0(i,x,v) #define inode_ctx_del(i,x,v) inode_ctx_del2(i,x,v,0) -#define inode_ctx_del1(i, x, v) inode_ctx_del2(i, x, 0, v) gf_boolean_t __is_root_gfid (uuid_t gfid); diff --git a/tests/basic/afr/split-brain-healing.t b/tests/basic/afr/split-brain-healing.t index c80f900b909..773a8b33b12 100644 --- a/tests/basic/afr/split-brain-healing.t +++ b/tests/basic/afr/split-brain-healing.t @@ -76,6 +76,7 @@ do done BIGGER_FILE_SIZE=$(stat -c %s file1) + TEST $CLI volume start $V0 force EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" afr_child_up_status $V0 1 EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" afr_child_up_status $V0 3 diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c index fa1ac13078e..1d6564cb962 100644 --- a/xlators/cluster/dht/src/dht-common.c +++ b/xlators/cluster/dht/src/dht-common.c @@ -6336,9 +6336,9 @@ dht_file_removexattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, out: if (local->fop == GF_FOP_REMOVEXATTR) { - DHT_STACK_UNWIND (removexattr, frame, op_ret, op_errno, xdata); + DHT_STACK_UNWIND (removexattr, frame, op_ret, op_errno, NULL); } else { - DHT_STACK_UNWIND (fremovexattr, frame, op_ret, op_errno, xdata); + DHT_STACK_UNWIND (fremovexattr, frame, op_ret, op_errno, NULL); } return 0; diff --git a/xlators/performance/readdir-ahead/src/readdir-ahead-mem-types.h b/xlators/performance/readdir-ahead/src/readdir-ahead-mem-types.h index ae533840c7e..39e2c536975 100644 --- a/xlators/performance/readdir-ahead/src/readdir-ahead-mem-types.h +++ b/xlators/performance/readdir-ahead/src/readdir-ahead-mem-types.h @@ -18,7 +18,6 @@ enum gf_rda_mem_types_ { gf_rda_mt_rda_local = gf_common_mt_end + 1, gf_rda_mt_rda_fd_ctx, gf_rda_mt_rda_priv, - gf_rda_mt_inode_ctx_t, gf_rda_mt_end }; diff --git a/xlators/performance/readdir-ahead/src/readdir-ahead.c b/xlators/performance/readdir-ahead/src/readdir-ahead.c index 16419859556..cb2e73f9d4d 100644 --- a/xlators/performance/readdir-ahead/src/readdir-ahead.c +++ b/xlators/performance/readdir-ahead/src/readdir-ahead.c @@ -33,17 +33,6 @@ #include "readdir-ahead-messages.h" static int rda_fill_fd(call_frame_t *, xlator_t *, fd_t *); -static void -rda_local_wipe (struct rda_local *local) -{ - if (local->fd) - fd_unref (local->fd); - if (local->xattrs) - dict_unref (local->xattrs); - if (local->inode) - inode_unref (local->inode); -} - /* * Get (or create) the fd context for storing prepopulated directory * entries. @@ -81,71 +70,6 @@ out: return ctx; } -static rda_inode_ctx_t * -__rda_inode_ctx_get (inode_t *inode, xlator_t *this) -{ - int ret = -1; - uint64_t ctx_uint = 0; - rda_inode_ctx_t *ctx_p = NULL; - - ret = __inode_ctx_get1 (inode, this, &ctx_uint); - if (ret == 0) - return (rda_inode_ctx_t *)ctx_uint; - - ctx_p = GF_CALLOC (1, sizeof (*ctx_p), gf_rda_mt_inode_ctx_t); - if (!ctx_p) - return NULL; - - ret = __inode_ctx_set1 (inode, this, (uint64_t *)&ctx_p); - if (ret < 0) { - GF_FREE (ctx_p); - return NULL; - } - - return ctx_p; -} - -static int -__rda_inode_ctx_update_iatts (inode_t *inode, xlator_t *this, - struct iatt *stbuf_in, struct iatt *stbuf_out) -{ - rda_inode_ctx_t *ctx_p = NULL; - - if ((!stbuf_in) || (stbuf_in->ia_ctime == 0)) - return -1; - - ctx_p = __rda_inode_ctx_get (inode, this); - if (!ctx_p) - return -1; - - if ((stbuf_in->ia_ctime > ctx_p->statbuf.ia_ctime) || - ((stbuf_in->ia_ctime == ctx_p->statbuf.ia_ctime) && - (stbuf_in->ia_ctime_nsec >= ctx_p->statbuf.ia_ctime_nsec))) { - ctx_p->statbuf = *stbuf_in; - } - - if (stbuf_out) - *stbuf_out = ctx_p->statbuf; - - return 0; -} - -static int -rda_inode_ctx_update_iatts (inode_t *inode, xlator_t *this, - struct iatt *stbuf_in, struct iatt *stbuf_out) -{ - int ret = -1; - - LOCK(&inode->lock); - { - ret = __rda_inode_ctx_update_iatts (inode, this, stbuf_in, - stbuf_out); - } - UNLOCK(&inode->lock); - - return ret; -} - /* * Reset the tracking state of the context. */ @@ -200,8 +124,6 @@ __rda_fill_readdirp (xlator_t *this, gf_dirent_t *entries, size_t request_size, size_t dirent_size, size = 0; int32_t count = 0; struct rda_priv *priv = NULL; - struct iatt tmp_stat = {0,}; - size_t inodectx_size = 0; priv = this->private; @@ -210,27 +132,6 @@ __rda_fill_readdirp (xlator_t *this, gf_dirent_t *entries, size_t request_size, if (size + dirent_size > request_size) break; - inodectx_size = 0; - memset (&tmp_stat, 0, sizeof (tmp_stat)); - - if (dirent->inode) { - inode_ctx_del (dirent->inode, this, - (void *)&inodectx_size); - if (inode_is_linked (dirent->inode)) { - rda_inode_ctx_update_iatts (dirent->inode, this, - &dirent->d_stat, - &tmp_stat); - dirent->d_stat = tmp_stat; - } else { - tmp_stat = dirent->d_stat; - memset (&dirent->d_stat, 0, - sizeof (dirent->d_stat)); - gf_uuid_copy (dirent->d_stat.ia_gfid, - tmp_stat.ia_gfid); - dirent->d_stat.ia_type = tmp_stat.ia_type; - } - } - size += dirent_size; list_del_init(&dirent->list); ctx->cur_size -= dirent_size; @@ -394,7 +295,7 @@ rda_fill_fd_cbk (call_frame_t *frame, void *cookie, xlator_t *this, struct rda_fd_ctx *ctx = local->ctx; struct rda_priv *priv = this->private; int fill = 1; - size_t dirent_size = 0, inodectx_size = 0; + size_t dirent_size = 0; int ret = 0; gf_boolean_t serve = _gf_false; call_stub_t *stub = NULL; @@ -421,14 +322,6 @@ rda_fill_fd_cbk (call_frame_t *frame, void *cookie, xlator_t *this, dirent_size = gf_dirent_size (dirent->d_name); - inodectx_size = 0; - - if (dirent->inode) { - inodectx_size = inode_ctx_size (dirent->inode); - inode_ctx_set0 (dirent->inode, this, - (void *)inodectx_size); - } - ctx->cur_size += dirent_size; GF_ATOMIC_ADD(priv->rda_cache_size, dirent_size); @@ -486,7 +379,6 @@ out: ctx->xattrs = NULL; } - rda_local_wipe (ctx->fill_frame->local); STACK_DESTROY(ctx->fill_frame->root); ctx->fill_frame = NULL; } @@ -552,7 +444,7 @@ rda_fill_fd(call_frame_t *frame, xlator_t *this, fd_t *fd) } local->ctx = ctx; - local->fd = fd_ref (fd); + local->fd = fd; nframe->local = local; ctx->fill_frame = nframe; @@ -577,10 +469,8 @@ rda_fill_fd(call_frame_t *frame, xlator_t *this, fd_t *fd) return 0; err: - if (nframe) { - rda_local_wipe (nframe->local); + if (nframe) FRAME_DESTROY(nframe); - } return -1; } @@ -589,10 +479,24 @@ static int32_t rda_opendir_cbk(call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, int32_t op_errno, fd_t *fd, dict_t *xdata) { + struct rda_local *local = frame->local; + if (!op_ret) rda_fill_fd(frame, this, fd); - RDA_STACK_UNWIND(opendir, frame, op_ret, op_errno, fd, xdata); + frame->local = NULL; + + STACK_UNWIND_STRICT(opendir, frame, op_ret, op_errno, fd, xdata); + + if (local && local->xattrs) { + /* unref for dict_new() done in rda_opendir */ + dict_unref (local->xattrs); + local->xattrs = NULL; + } + + if (local) + mem_put (local); + return 0; } @@ -636,413 +540,6 @@ unwind: } static int32_t -rda_writev_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int32_t op_ret, int32_t op_errno, struct iatt *prebuf, - struct iatt *postbuf, dict_t *xdata) -{ - struct rda_local *local = NULL; - struct iatt postbuf_out = {0,}; - - if (op_ret < 0) - goto unwind; - - local = frame->local; - rda_inode_ctx_update_iatts (local->inode, this, postbuf, &postbuf_out); -unwind: - RDA_STACK_UNWIND (writev, frame, op_ret, op_errno, prebuf, - &postbuf_out, xdata); - return 0; -} - -static int32_t -rda_writev (call_frame_t *frame, xlator_t *this, fd_t *fd, - struct iovec *vector, int32_t count, off_t off, uint32_t flags, - struct iobref *iobref, dict_t *xdata) -{ - RDA_COMMON_MODIFICATION_FOP (writev, frame, this, fd->inode, xdata, fd, - vector, count, off, flags, iobref); - return 0; -} - -static int32_t -rda_fallocate_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int32_t op_ret, int32_t op_errno, struct iatt *prebuf, - struct iatt *postbuf, dict_t *xdata) -{ - struct rda_local *local = NULL; - struct iatt postbuf_out = {0,}; - - if (op_ret < 0) - goto unwind; - - local = frame->local; - rda_inode_ctx_update_iatts (local->inode, this, postbuf, &postbuf_out); -unwind: - RDA_STACK_UNWIND (fallocate, frame, op_ret, op_errno, prebuf, - &postbuf_out, xdata); - return 0; -} - -static int32_t -rda_fallocate (call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t keep_size, - off_t offset, size_t len, dict_t *xdata) -{ - RDA_COMMON_MODIFICATION_FOP (fallocate, frame, this, fd->inode, xdata, - fd, keep_size, offset, len); - return 0; -} - -static int32_t -rda_zerofill_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int32_t op_ret, int32_t op_errno, struct iatt *prebuf, - struct iatt *postbuf, dict_t *xdata) -{ - struct rda_local *local = NULL; - struct iatt postbuf_out = {0,}; - - if (op_ret < 0) - goto unwind; - - local = frame->local; - rda_inode_ctx_update_iatts (local->inode, this, postbuf, &postbuf_out); -unwind: - RDA_STACK_UNWIND (zerofill, frame, op_ret, op_errno, prebuf, - &postbuf_out, xdata); - return 0; -} - -static int32_t -rda_zerofill (call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset, - off_t len, dict_t *xdata) -{ - RDA_COMMON_MODIFICATION_FOP (zerofill, frame, this, fd->inode, xdata, - fd, offset, len); - return 0; -} - -static int32_t -rda_discard_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int32_t op_ret, int32_t op_errno, struct iatt *prebuf, - struct iatt *postbuf, dict_t *xdata) -{ - struct rda_local *local = NULL; - struct iatt postbuf_out = {0,}; - - if (op_ret < 0) - goto unwind; - - local = frame->local; - rda_inode_ctx_update_iatts (local->inode, this, postbuf, &postbuf_out); -unwind: - RDA_STACK_UNWIND (discard, frame, op_ret, op_errno, prebuf, - &postbuf_out, xdata); - return 0; -} - -static int32_t -rda_discard (call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset, - size_t len, dict_t *xdata) -{ - RDA_COMMON_MODIFICATION_FOP (discard, frame, this, fd->inode, xdata, - fd, offset, len); - return 0; -} - -static int32_t -rda_ftruncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int32_t op_ret, int32_t op_errno, struct iatt *prebuf, - struct iatt *postbuf, dict_t *xdata) -{ - struct rda_local *local = NULL; - struct iatt postbuf_out = {0,}; - - if (op_ret < 0) - goto unwind; - - local = frame->local; - rda_inode_ctx_update_iatts (local->inode, this, postbuf, &postbuf_out); -unwind: - RDA_STACK_UNWIND (ftruncate, frame, op_ret, op_errno, prebuf, - &postbuf_out, xdata); - return 0; -} - -static int32_t -rda_ftruncate (call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset, - dict_t *xdata) -{ - RDA_COMMON_MODIFICATION_FOP (ftruncate, frame, this, fd->inode, xdata, - fd, offset); - return 0; -} - -static int32_t -rda_truncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int32_t op_ret, int32_t op_errno, struct iatt *prebuf, - struct iatt *postbuf, dict_t *xdata) -{ - struct rda_local *local = NULL; - struct iatt postbuf_out = {0,}; - - if (op_ret < 0) - goto unwind; - - local = frame->local; - rda_inode_ctx_update_iatts (local->inode, this, postbuf, &postbuf_out); -unwind: - RDA_STACK_UNWIND (ftruncate, frame, op_ret, op_errno, prebuf, - &postbuf_out, xdata); - return 0; -} - -static int32_t -rda_truncate (call_frame_t *frame, xlator_t *this, loc_t *loc, off_t offset, - dict_t *xdata) -{ - RDA_COMMON_MODIFICATION_FOP (truncate, frame, this, loc->inode, xdata, - loc, offset); - return 0; -} - -/* -static int32_t -rda_setxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int32_t op_ret, int32_t op_errno, dict_t *xdata) -{ - int ret = 0; - struct iatt *stbuf = NULL; - struct rda_local *local = NULL; - - if (op_ret < 0) - goto unwind; - - local = frame->local; - - ret = dict_get_bin (xdata, DHT_IATT_IN_XDATA_KEY, (void **) &stbuf); - if (ret) - gf_msg (this->name, GF_LOG_WARNING, -ret, - READDIR_AHEAD_MSG_DICT_OP_FAILED, "Failed to get key " - DHT_IATT_IN_XDATA_KEY" in xdata"); - else - rda_inode_ctx_update_iatts (local->inode, this, stbuf, NULL); -unwind: - RDA_STACK_UNWIND (setxattr, frame, op_ret, op_errno, xdata); - return 0; -} - -static int32_t -rda_setxattr (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *dict, - int32_t flags, dict_t *xdata) -{ - int ret = 0; - dict_t *xdata_req = NULL; - - xdata_req = (xdata) ? xdata : get_new_dict (); - - ret = dict_set_int8 (xdata_req, DHT_IATT_IN_XDATA_KEY, 1); - if (ret) - gf_msg (this->name, GF_LOG_WARNING, 0, - READDIR_AHEAD_MSG_DICT_OP_FAILED, "Dict set of key %s " - "failed", DHT_IATT_IN_XDATA_KEY); - - RDA_COMMON_MODIFICATION_FOP (setxattr, frame, this, loc->inode, - xdata_req, loc, dict, flags); - return 0; -} - -static int32_t -rda_fsetxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int32_t op_ret, int32_t op_errno, dict_t *xdata) -{ - int ret = 0; - struct iatt *stbuf = NULL; - struct rda_local *local = NULL; - - if (op_ret < 0) - goto unwind; - - local = frame->local; - - ret = dict_get_bin (xdata, DHT_IATT_IN_XDATA_KEY, (void **) &stbuf); - if (ret) - gf_msg (this->name, GF_LOG_WARNING, -ret, - READDIR_AHEAD_MSG_DICT_OP_FAILED, "Failed to get key " - DHT_IATT_IN_XDATA_KEY" in xdata"); - else - rda_inode_ctx_update_iatts (local->inode, this, stbuf, NULL); -unwind: - RDA_STACK_UNWIND (fsetxattr, frame, op_ret, op_errno, xdata); - return 0; -} - -static int32_t -rda_fsetxattr (call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *dict, - int32_t flags, dict_t *xdata) -{ - int ret = 0; - dict_t *xdata_req = NULL; - - xdata_req = (xdata) ? xdata : get_new_dict (); - - ret = dict_set_int8 (xdata_req, DHT_IATT_IN_XDATA_KEY, 1); - if (ret) - gf_msg (this->name, GF_LOG_WARNING, 0, - READDIR_AHEAD_MSG_DICT_OP_FAILED, "Dict set of key %s " - "failed", DHT_IATT_IN_XDATA_KEY); - - RDA_COMMON_MODIFICATION_FOP (fsetxattr, frame, this, fd->inode, - xdata_req, fd, dict, flags); - return 0; -} -*/ - -static int32_t -rda_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int32_t op_ret, int32_t op_errno, struct iatt *statpre, - struct iatt *statpost, dict_t *xdata) -{ - struct rda_local *local = NULL; - struct iatt postbuf_out = {0,}; - - if (op_ret < 0) - goto unwind; - - local = frame->local; - rda_inode_ctx_update_iatts (local->inode, this, statpost, &postbuf_out); -unwind: - RDA_STACK_UNWIND (setattr, frame, op_ret, op_errno, statpre, - &postbuf_out, xdata); - return 0; -} - -static int32_t -rda_setattr (call_frame_t *frame, xlator_t *this, loc_t *loc, - struct iatt *stbuf, int32_t valid, dict_t *xdata) -{ - RDA_COMMON_MODIFICATION_FOP (setattr, frame, this, loc->inode, xdata, - loc, stbuf, valid); - return 0; -} - -static int32_t -rda_fsetattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int32_t op_ret, int32_t op_errno, struct iatt *statpre, - struct iatt *statpost, dict_t *xdata) -{ - struct rda_local *local = NULL; - struct iatt postbuf_out = {0,}; - - if (op_ret < 0) - goto unwind; - - local = frame->local; - rda_inode_ctx_update_iatts (local->inode, this, statpost, &postbuf_out); -unwind: - RDA_STACK_UNWIND (fsetattr, frame, op_ret, op_errno, statpre, - &postbuf_out, xdata); - return 0; -} - -static int32_t -rda_fsetattr (call_frame_t *frame, xlator_t *this, fd_t *fd, struct iatt *stbuf, - int32_t valid, dict_t *xdata) -{ - RDA_COMMON_MODIFICATION_FOP (fsetattr, frame, this, fd->inode, xdata, - fd, stbuf, valid); - return 0; -} - -static int32_t -rda_removexattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int32_t op_ret, int32_t op_errno, dict_t *xdata) -{ - int ret = 0; - struct iatt *stbuf = NULL; - struct rda_local *local = NULL; - - if (op_ret < 0) - goto unwind; - - local = frame->local; - - ret = dict_get_bin (xdata, DHT_IATT_IN_XDATA_KEY, (void **) &stbuf); - if (ret) - gf_msg (this->name, GF_LOG_WARNING, -ret, - READDIR_AHEAD_MSG_DICT_OP_FAILED, "Failed to get key " - DHT_IATT_IN_XDATA_KEY" in xdata"); - else - rda_inode_ctx_update_iatts (local->inode, this, stbuf, NULL); -unwind: - RDA_STACK_UNWIND (removexattr, frame, op_ret, op_errno, xdata); - return 0; -} - -static int32_t -rda_removexattr (call_frame_t *frame, xlator_t *this, loc_t *loc, - const char *name, dict_t *xdata) -{ - int ret = 0; - dict_t *xdata_req = NULL; - - xdata_req = (xdata) ? xdata : get_new_dict (); - - ret = dict_set_int8 (xdata_req, DHT_IATT_IN_XDATA_KEY, 1); - if (ret) - gf_msg (this->name, GF_LOG_WARNING, 0, - READDIR_AHEAD_MSG_DICT_OP_FAILED, "Dict set of key:%s " - "failed", DHT_IATT_IN_XDATA_KEY); - - RDA_COMMON_MODIFICATION_FOP (removexattr, frame, this, loc->inode, - xdata_req, loc, name); - return 0; -} - -static int32_t -rda_fremovexattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int32_t op_ret, int32_t op_errno, dict_t *xdata) -{ - int ret = 0; - struct iatt *stbuf = NULL; - struct rda_local *local = NULL; - - if (op_ret < 0) - goto unwind; - - local = frame->local; - - ret = dict_get_bin (xdata, DHT_IATT_IN_XDATA_KEY, (void **) &stbuf); - if (ret) - gf_msg (this->name, GF_LOG_WARNING, -ret, - READDIR_AHEAD_MSG_DICT_OP_FAILED, "Failed to get key " - DHT_IATT_IN_XDATA_KEY" in xdata"); - else - rda_inode_ctx_update_iatts (local->inode, this, stbuf, NULL); -unwind: - RDA_STACK_UNWIND (fremovexattr, frame, op_ret, op_errno, xdata); - return 0; -} - -static int32_t -rda_fremovexattr (call_frame_t *frame, xlator_t *this, fd_t *fd, - const char *name, dict_t *xdata) -{ - int ret = 0; - dict_t *xdata_req = NULL; - - xdata_req = (xdata) ? xdata : get_new_dict (); - - ret = dict_set_int8 (xdata_req, DHT_IATT_IN_XDATA_KEY, 1); - if (ret) - gf_msg (this->name, GF_LOG_WARNING, 0, - READDIR_AHEAD_MSG_DICT_OP_FAILED, "Dict set of key:%s " - "failed", DHT_IATT_IN_XDATA_KEY); - - RDA_COMMON_MODIFICATION_FOP (fremovexattr, frame, this, fd->inode, - xdata_req, fd, name); - return 0; -} - -static int32_t rda_releasedir(xlator_t *this, fd_t *fd) { uint64_t val; @@ -1069,23 +566,6 @@ rda_releasedir(xlator_t *this, fd_t *fd) return 0; } -static int -rda_forget (xlator_t *this, inode_t *inode) -{ - uint64_t ctx_uint = 0; - rda_inode_ctx_t *ctx = NULL; - - inode_ctx_del1 (inode, this, &ctx_uint); - if (!ctx_uint) - return 0; - - ctx = (rda_inode_ctx_t *)ctx_uint; - - GF_FREE (ctx); - - return 0; -} - int32_t mem_acct_init(xlator_t *this) { @@ -1197,30 +677,10 @@ out: struct xlator_fops fops = { .opendir = rda_opendir, .readdirp = rda_readdirp, - /* inode write */ - /* TODO: invalidate a dentry's stats if its pointing to a directory - * when entry operations happen in that directory - */ - .writev = rda_writev, - .truncate = rda_truncate, - .ftruncate = rda_ftruncate, - .fallocate = rda_fallocate, - .discard = rda_discard, - .zerofill = rda_zerofill, - /* metadata write */ - /* TODO: Invalidate stats in (f)setxattr - .setxattr = rda_setxattr, - .fsetxattr = rda_fsetxattr, - */ - .setattr = rda_setattr, - .fsetattr = rda_fsetattr, - .removexattr = rda_removexattr, - .fremovexattr = rda_fremovexattr, }; struct xlator_cbks cbks = { .releasedir = rda_releasedir, - .forget = rda_forget, }; struct volume_options options[] = { diff --git a/xlators/performance/readdir-ahead/src/readdir-ahead.h b/xlators/performance/readdir-ahead/src/readdir-ahead.h index 7ffb92a9be8..3c06cc0f107 100644 --- a/xlators/performance/readdir-ahead/src/readdir-ahead.h +++ b/xlators/performance/readdir-ahead/src/readdir-ahead.h @@ -19,37 +19,6 @@ #define RDA_FD_BYPASS (1 << 4) #define RDA_FD_PLUGGED (1 << 5) - -#define RDA_COMMON_MODIFICATION_FOP(name, frame, this, __inode, __xdata, args ...)\ - do { \ - struct rda_local *__local = NULL; \ - \ - __local = mem_get0 (this->local_pool); \ - __local->inode = inode_ref (__inode); \ - \ - frame->local = __local; \ - if (__xdata) \ - __local->xattrs = dict_ref (__xdata); \ - \ - STACK_WIND (frame, rda_##name##_cbk, FIRST_CHILD(this), \ - FIRST_CHILD(this)->fops->name, args, __xdata); \ - } while (0) - - -#define RDA_STACK_UNWIND(fop, frame, params ...) do { \ - struct rda_local *__local = NULL; \ - if (frame) { \ - __local = frame->local; \ - frame->local = NULL; \ - } \ - STACK_UNWIND_STRICT (fop, frame, params); \ - if (__local) { \ - rda_local_wipe (__local); \ - mem_put (__local); \ - } \ -} while (0) - - struct rda_fd_ctx { off_t cur_offset; /* current head of the ctx */ size_t cur_size; /* current size of the preload */ @@ -67,9 +36,7 @@ struct rda_local { struct rda_fd_ctx *ctx; fd_t *fd; off_t offset; - dict_t *xattrs; /* md-cache keys to be sent in readdirp() */ - int32_t skip_dir; - inode_t *inode; + dict_t *xattrs; /* xattrs to be sent in readdirp() */ }; struct rda_priv { @@ -81,8 +48,4 @@ struct rda_priv { gf_boolean_t parallel_readdir; }; -typedef struct rda_inode_ctx { - struct iatt statbuf; -} rda_inode_ctx_t; - #endif /* __READDIR_AHEAD_H */ |