diff options
| author | Amar Tumballi <amar@gluster.com> | 2011-11-16 15:39:29 +0530 |
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2011-11-16 03:44:32 -0800 |
| commit | 14f4e023822a22e0a4902acfd28c8f5ea8c94ccd (patch) | |
| tree | 580ae84b87adf7f7ce83d6a409c303aa49ba4220 /xlators/cluster | |
| parent | 217842180858afff79d06c24389752299c5ed716 (diff) | |
core: remove 'ino' variable from 'inode_t' structure
Change-Id: I0f078d1753db65d2f2e0380d1b0450c114cf40dd
BUG: 3518
Reviewed-on: http://review.gluster.com/522
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
Diffstat (limited to 'xlators/cluster')
| -rw-r--r-- | xlators/cluster/afr/src/afr-common.c | 3 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr-dir-write.c | 1 | ||||
| -rw-r--r-- | xlators/cluster/afr/src/afr-self-heald.c | 2 | ||||
| -rw-r--r-- | xlators/cluster/dht/src/dht-helper.c | 5 | ||||
| -rw-r--r-- | xlators/cluster/stripe/src/stripe.c | 1 |
5 files changed, 4 insertions, 8 deletions
diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c index 5c085b611a3..99305b718fa 100644 --- a/xlators/cluster/afr/src/afr-common.c +++ b/xlators/cluster/afr/src/afr-common.c @@ -44,6 +44,7 @@ #include "compat.h" #include "byte-order.h" #include "statedump.h" +#include "inode.h" #include "fd.h" @@ -1807,7 +1808,7 @@ afr_set_root_inode_on_first_lookup (afr_local_t *local, xlator_t *this, afr_private_t *priv = NULL; GF_ASSERT (inode); - if (inode->ino != 1) + if (!__is_root_gfid (inode->gfid)) goto out; if (!afr_is_fresh_lookup (&local->loc, this)) goto out; diff --git a/xlators/cluster/afr/src/afr-dir-write.c b/xlators/cluster/afr/src/afr-dir-write.c index 2d7f98a2a7d..ca669b684f4 100644 --- a/xlators/cluster/afr/src/afr-dir-write.c +++ b/xlators/cluster/afr/src/afr-dir-write.c @@ -70,7 +70,6 @@ afr_build_parent_loc (loc_t *parent, loc_t *child) parent->inode = inode_ref (child->parent); parent->parent = inode_parent (parent->inode, 0, NULL); - parent->ino = parent->inode->ino; if (!uuid_is_null (child->pargfid)) uuid_copy (parent->gfid, child->pargfid); diff --git a/xlators/cluster/afr/src/afr-self-heald.c b/xlators/cluster/afr/src/afr-self-heald.c index afddf62c2e4..d0cd2f02d26 100644 --- a/xlators/cluster/afr/src/afr-self-heald.c +++ b/xlators/cluster/afr/src/afr-self-heald.c @@ -501,8 +501,6 @@ afr_build_root_loc (inode_t *inode, loc_t *loc) loc->path = "/"; loc->name = ""; loc->inode = inode; - loc->ino = 1; - loc->inode->ino = 1; loc->inode->ia_type = IA_IFDIR; memset (loc->inode->gfid, 0, 16); loc->inode->gfid[15] = 1; diff --git a/xlators/cluster/dht/src/dht-helper.c b/xlators/cluster/dht/src/dht-helper.c index d8138067ee5..01d11ee68f1 100644 --- a/xlators/cluster/dht/src/dht-helper.c +++ b/xlators/cluster/dht/src/dht-helper.c @@ -117,7 +117,6 @@ dht_filter_loc_subvol_key (xlator_t *this, loc_t *loc, loc_t *new_loc, new_loc->path = ((new_path) ? new_path: gf_strdup (loc->path)); new_loc->name = new_name; - new_loc->ino = loc->ino; new_loc->inode = inode_ref (loc->inode); new_loc->parent = inode_ref (loc->parent); } @@ -368,8 +367,8 @@ dht_subvol_get_hashed (xlator_t *this, loc_t *loc) if (!layout) { gf_log (this->name, GF_LOG_DEBUG, - "layout missing path=%s parent=%"PRId64, - loc->path, loc->parent->ino); + "layout missing path=%s parent=%s", + loc->path, uuid_utoa (loc->parent->gfid)); goto out; } diff --git a/xlators/cluster/stripe/src/stripe.c b/xlators/cluster/stripe/src/stripe.c index 4faa0a828d8..925687534c7 100644 --- a/xlators/cluster/stripe/src/stripe.c +++ b/xlators/cluster/stripe/src/stripe.c @@ -4205,7 +4205,6 @@ unlock: if (!inode) goto out; - loc.ino = inode->ino = local_entry->d_ino; loc.inode = inode; loc.parent = local->fd->inode; ret = inode_path (local->fd->inode, local_entry->d_name, &path); |