summaryrefslogtreecommitdiffstats
path: root/xlators/protocol/legacy
diff options
context:
space:
mode:
authorAnand Avati <avati@gluster.com>2010-09-03 13:58:48 +0000
committerVijay Bellur <vijay@dev.gluster.com>2010-09-04 01:45:06 -0700
commitac60a2a7f3c7b07830669e282d9fc796cbc78f38 (patch)
treee99cb728b67e18498440fd55c2ab46b0a5c16d06 /xlators/protocol/legacy
parent2822157056d8347518f7e1b8bf9ee04bea7286ae (diff)
gfid: changes in inode management
- incorporate usage of uuid (gfid) as the key for finding inodes - deprecate inode number/generation number based inode_get - undo code specific to generation numbers (attic list etc.) Signed-off-by: Anand V. Avati <avati@blackhole.gluster.com> Signed-off-by: Anand V. Avati <avati@amp.gluster.com> Signed-off-by: Vijay Bellur <vijay@dev.gluster.com> BUG: 971 (dynamic volume management) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=971
Diffstat (limited to 'xlators/protocol/legacy')
-rw-r--r--xlators/protocol/legacy/server/src/server-protocol.c7
-rw-r--r--xlators/protocol/legacy/server/src/server-resolve.c6
2 files changed, 4 insertions, 9 deletions
diff --git a/xlators/protocol/legacy/server/src/server-protocol.c b/xlators/protocol/legacy/server/src/server-protocol.c
index 35d58ae99cd..56acc59b791 100644
--- a/xlators/protocol/legacy/server/src/server-protocol.c
+++ b/xlators/protocol/legacy/server/src/server-protocol.c
@@ -2068,13 +2068,6 @@ server_create_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
state->loc.name, stbuf);
if (link_inode != inode) {
- gf_log (this->name, GF_LOG_DEBUG,
- "create(%s) inode (ptr=%p, ino=%"PRId64", "
- "gen=%"PRId64") found conflict (ptr=%p, "
- "ino=%"PRId64", gen=%"PRId64")",
- state->loc.path, inode, inode->ino,
- inode->generation, link_inode,
- link_inode->ino, link_inode->generation);
/*
VERY racy code (if used anywhere else)
diff --git a/xlators/protocol/legacy/server/src/server-resolve.c b/xlators/protocol/legacy/server/src/server-resolve.c
index 63351fd34f0..f08ec1c060c 100644
--- a/xlators/protocol/legacy/server/src/server-resolve.c
+++ b/xlators/protocol/legacy/server/src/server-resolve.c
@@ -354,7 +354,8 @@ resolve_entry_simple (call_frame_t *frame)
goto out;
}
- if (parent->ino != 1 && parent->generation != resolve->gen) {
+// if (parent->ino != 1 && parent->generation != resolve->gen) {
+ if (0) {
/* simple resolution is decisive - request was for a
stale handle */
resolve->op_ret = -1;
@@ -468,7 +469,8 @@ resolve_inode_simple (call_frame_t *frame)
goto out;
}
- if (inode->ino != 1 && inode->generation != resolve->gen) {
+// if (inode->ino != 1 && inode->generation != resolve->gen) {
+ if (0) {
resolve->op_ret = -1;
resolve->op_errno = ENOENT;
ret = -1;