diff options
author | Pranith Kumar K <pranithk@gluster.com> | 2011-10-25 11:45:10 +0530 |
---|---|---|
committer | Vijay Bellur <vijay@gluster.com> | 2011-10-28 05:49:40 -0700 |
commit | af708e9fc2eb2104b9e8e3b5a3eaf99201664324 (patch) | |
tree | 524d1afbb7ad388422b53b6827ec54cb17fe7acf | |
parent | c770722983f73aa838b5985755999050c746550a (diff) |
cluster/afr: Remove unused 'ino' code
Change-Id: I425e2d23e9e45f10ddeff2eacf918dd90f8baee7
BUG: 3744
Reviewed-on: http://review.gluster.com/639
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
-rw-r--r-- | xlators/cluster/afr/src/afr-common.c | 4 | ||||
-rw-r--r-- | xlators/cluster/afr/src/afr-dir-write.c | 30 | ||||
-rw-r--r-- | xlators/cluster/afr/src/afr-inode-read.c | 5 | ||||
-rw-r--r-- | xlators/cluster/afr/src/afr-inode-write.c | 6 | ||||
-rw-r--r-- | xlators/cluster/afr/src/afr.h | 33 |
5 files changed, 0 insertions, 78 deletions
diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c index 114812c6339..5c085b611a3 100644 --- a/xlators/cluster/afr/src/afr-common.c +++ b/xlators/cluster/afr/src/afr-common.c @@ -1981,9 +1981,6 @@ afr_lookup (call_frame_t *frame, xlator_t *this, UNLOCK (&priv->read_child_lock); } - if (loc->parent) - local->cont.lookup.parent_ino = loc->parent->ino; - local->child_up = memdup (priv->child_up, sizeof (*local->child_up) * priv->child_count); if (NULL == local->child_up) { @@ -2485,7 +2482,6 @@ afr_fsync (call_frame_t *frame, xlator_t *this, fd_t *fd, frame->local = local; local->fd = fd_ref (fd); - local->cont.fsync.ino = fd->inode->ino; for (i = 0; i < priv->child_count; i++) { if (local->child_up[i]) { diff --git a/xlators/cluster/afr/src/afr-dir-write.c b/xlators/cluster/afr/src/afr-dir-write.c index 2929ad741d8..2d7f98a2a7d 100644 --- a/xlators/cluster/afr/src/afr-dir-write.c +++ b/xlators/cluster/afr/src/afr-dir-write.c @@ -311,9 +311,6 @@ afr_create (call_frame_t *frame, xlator_t *this, if (params) local->cont.create.params = dict_ref (params); - if (loc->parent) - local->cont.create.parent_ino = loc->parent->ino; - local->transaction.fop = afr_create_wind; local->transaction.done = afr_create_done; local->transaction.unwind = afr_create_unwind; @@ -536,9 +533,6 @@ afr_mknod (call_frame_t *frame, xlator_t *this, if (params) local->cont.mknod.params = dict_ref (params); - if (loc->parent) - local->cont.mknod.parent_ino = loc->parent->ino; - local->transaction.fop = afr_mknod_wind; local->transaction.done = afr_mknod_done; local->transaction.unwind = afr_mknod_unwind; @@ -762,9 +756,6 @@ afr_mkdir (call_frame_t *frame, xlator_t *this, if (params) local->cont.mkdir.params = dict_ref (params); - if (loc->parent) - local->cont.mkdir.parent_ino = loc->parent->ino; - local->transaction.fop = afr_mkdir_wind; local->transaction.done = afr_mkdir_done; local->transaction.unwind = afr_mkdir_unwind; @@ -985,11 +976,6 @@ afr_link (call_frame_t *frame, xlator_t *this, } UNLOCK (&priv->read_child_lock); - local->cont.link.ino = oldloc->inode->ino; - - if (oldloc->parent) - local->cont.link.parent_ino = newloc->parent->ino; - local->transaction.fop = afr_link_wind; local->transaction.done = afr_link_done; local->transaction.unwind = afr_link_unwind; @@ -1215,9 +1201,6 @@ afr_symlink (call_frame_t *frame, xlator_t *this, if (params) local->cont.symlink.params = dict_ref (params); - if (loc->parent) - local->cont.symlink.parent_ino = loc->parent->ino; - local->transaction.fop = afr_symlink_wind; local->transaction.done = afr_symlink_done; local->transaction.unwind = afr_symlink_unwind; @@ -1426,13 +1409,6 @@ afr_rename (call_frame_t *frame, xlator_t *this, local->read_child_index = afr_inode_get_read_ctx (this, oldloc->inode, NULL); - local->cont.rename.ino = oldloc->inode->ino; - - if (oldloc->parent) - local->cont.rename.oldparent_ino = oldloc->parent->ino; - if (newloc->parent) - local->cont.rename.newparent_ino = newloc->parent->ino; - local->transaction.fop = afr_rename_wind; local->transaction.done = afr_rename_done; local->transaction.unwind = afr_rename_unwind; @@ -1627,9 +1603,6 @@ afr_unlink (call_frame_t *frame, xlator_t *this, loc_copy (&local->loc, loc); - if (loc->parent) - local->cont.unlink.parent_ino = loc->parent->ino; - local->transaction.fop = afr_unlink_wind; local->transaction.done = afr_unlink_done; local->transaction.unwind = afr_unlink_unwind; @@ -1825,9 +1798,6 @@ afr_rmdir (call_frame_t *frame, xlator_t *this, local->cont.rmdir.flags = flags; loc_copy (&local->loc, loc); - if (loc->parent) - local->cont.rmdir.parent_ino = loc->parent->ino; - local->transaction.fop = afr_rmdir_wind; local->transaction.done = afr_rmdir_done; local->transaction.unwind = afr_rmdir_unwind; diff --git a/xlators/cluster/afr/src/afr-inode-read.c b/xlators/cluster/afr/src/afr-inode-read.c index 1258afe09fc..82a9d27c075 100644 --- a/xlators/cluster/afr/src/afr-inode-read.c +++ b/xlators/cluster/afr/src/afr-inode-read.c @@ -270,8 +270,6 @@ afr_stat (call_frame_t *frame, xlator_t *this, loc_t *loc) } loc_copy (&local->loc, loc); - local->cont.stat.ino = loc->inode->ino; - STACK_WIND_COOKIE (frame, afr_stat_cbk, (void *) (long) call_child, children[call_child], children[call_child]->fops->stat, @@ -393,7 +391,6 @@ afr_fstat (call_frame_t *frame, xlator_t *this, goto out; } - local->cont.fstat.ino = fd->inode->ino; local->fd = fd_ref (fd); op_ret = afr_open_fd_fix (frame, this, _gf_false); @@ -518,7 +515,6 @@ afr_readlink (call_frame_t *frame, xlator_t *this, loc_copy (&local->loc, loc); local->cont.readlink.size = size; - local->cont.readlink.ino = loc->inode->ino; STACK_WIND_COOKIE (frame, afr_readlink_cbk, (void *) (long) call_child, @@ -1035,7 +1031,6 @@ afr_readv (call_frame_t *frame, xlator_t *this, local->fd = fd_ref (fd); - local->cont.readv.ino = fd->inode->ino; local->cont.readv.size = size; local->cont.readv.offset = offset; diff --git a/xlators/cluster/afr/src/afr-inode-write.c b/xlators/cluster/afr/src/afr-inode-write.c index 639b89b1ffd..3f78c7b3658 100644 --- a/xlators/cluster/afr/src/afr-inode-write.c +++ b/xlators/cluster/afr/src/afr-inode-write.c @@ -462,7 +462,6 @@ afr_writev (call_frame_t *frame, xlator_t *this, fd_t *fd, local->cont.writev.vector = iov_dup (vector, count); local->cont.writev.count = count; local->cont.writev.offset = offset; - local->cont.writev.ino = fd->inode->ino; local->cont.writev.iobref = iobref_ref (iobref); local->fd = fd_ref (fd); @@ -666,7 +665,6 @@ afr_truncate (call_frame_t *frame, xlator_t *this, local->op_ret = -1; local->cont.truncate.offset = offset; - local->cont.truncate.ino = loc->inode->ino; local->transaction.fop = afr_truncate_wind; local->transaction.done = afr_truncate_done; @@ -909,7 +907,6 @@ afr_ftruncate (call_frame_t *frame, xlator_t *this, frame->local = local; local->cont.ftruncate.offset = offset; - local->cont.ftruncate.ino = fd->inode->ino; local->fd = fd_ref (fd); local->fop_call_continue = afr_do_ftruncate; @@ -1113,8 +1110,6 @@ afr_setattr (call_frame_t *frame, xlator_t *this, local->op_ret = -1; - local->cont.setattr.ino = loc->inode->ino; - local->cont.setattr.in_buf = *buf; local->cont.setattr.valid = valid; @@ -1320,7 +1315,6 @@ afr_fsetattr (call_frame_t *frame, xlator_t *this, local->op_ret = -1; - local->cont.fsetattr.ino = fd->inode->ino; local->cont.fsetattr.in_buf = *buf; local->cont.fsetattr.valid = valid; diff --git a/xlators/cluster/afr/src/afr.h b/xlators/cluster/afr/src/afr.h index 1f6481e109c..45b09f7dda4 100644 --- a/xlators/cluster/afr/src/afr.h +++ b/xlators/cluster/afr/src/afr.h @@ -426,9 +426,6 @@ typedef struct _afr_local { inode_t *inode; struct iatt buf; struct iatt postparent; - ino_t ino; - uint64_t gen; - ino_t parent_ino; dict_t **xattrs; dict_t *xattr; struct iatt *postparents; @@ -459,18 +456,15 @@ typedef struct _afr_local { struct { int last_index; - ino_t ino; } stat; struct { int last_index; - ino_t ino; } fstat; struct { size_t size; int last_index; - ino_t ino; } readlink; struct { @@ -480,7 +474,6 @@ typedef struct _afr_local { } getxattr; struct { - ino_t ino; size_t size; off_t offset; int last_index; @@ -508,7 +501,6 @@ typedef struct _afr_local { /* inode write */ struct { - ino_t ino; struct iatt prebuf; struct iatt postbuf; @@ -521,27 +513,23 @@ typedef struct _afr_local { } writev; struct { - ino_t ino; struct iatt prebuf; struct iatt postbuf; } fsync; struct { - ino_t ino; off_t offset; struct iatt prebuf; struct iatt postbuf; } truncate; struct { - ino_t ino; off_t offset; struct iatt prebuf; struct iatt postbuf; } ftruncate; struct { - ino_t ino; struct iatt in_buf; int32_t valid; struct iatt preop_buf; @@ -549,7 +537,6 @@ typedef struct _afr_local { } setattr; struct { - ino_t ino; struct iatt in_buf; int32_t valid; struct iatt preop_buf; @@ -568,9 +555,6 @@ typedef struct _afr_local { /* dir write */ struct { - ino_t ino; - uint64_t gen; - ino_t parent_ino; fd_t *fd; dict_t *params; int32_t flags; @@ -583,9 +567,6 @@ typedef struct _afr_local { } create; struct { - ino_t ino; - uint64_t gen; - ino_t parent_ino; dev_t dev; mode_t mode; dict_t *params; @@ -597,9 +578,6 @@ typedef struct _afr_local { } mknod; struct { - ino_t ino; - uint64_t gen; - ino_t parent_ino; int32_t mode; dict_t *params; inode_t *inode; @@ -610,7 +588,6 @@ typedef struct _afr_local { } mkdir; struct { - ino_t parent_ino; int32_t op_ret; int32_t op_errno; struct iatt preparent; @@ -619,7 +596,6 @@ typedef struct _afr_local { struct { int flags; - ino_t parent_ino; int32_t op_ret; int32_t op_errno; struct iatt preparent; @@ -627,9 +603,6 @@ typedef struct _afr_local { } rmdir; struct { - ino_t oldparent_ino; - ino_t newparent_ino; - ino_t ino; struct iatt buf; struct iatt read_child_buf; struct iatt preoldparent; @@ -639,9 +612,6 @@ typedef struct _afr_local { } rename; struct { - ino_t ino; - uint64_t gen; - ino_t parent_ino; inode_t *inode; struct iatt buf; struct iatt read_child_buf; @@ -650,9 +620,6 @@ typedef struct _afr_local { } link; struct { - ino_t ino; - uint64_t gen; - ino_t parent_ino; inode_t *inode; dict_t *params; struct iatt buf; |