diff options
| author | Anand Avati <avati@gluster.com> | 2010-09-03 13:58:48 +0000 |
|---|---|---|
| committer | Vijay Bellur <vijay@dev.gluster.com> | 2010-09-04 01:45:06 -0700 |
| commit | ac60a2a7f3c7b07830669e282d9fc796cbc78f38 (patch) | |
| tree | e99cb728b67e18498440fd55c2ab46b0a5c16d06 /xlators/protocol | |
| parent | 2822157056d8347518f7e1b8bf9ee04bea7286ae (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')
4 files changed, 8 insertions, 19 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; diff --git a/xlators/protocol/server/src/server-resolve.c b/xlators/protocol/server/src/server-resolve.c index ec955b1e872..eba34bdf768 100644 --- a/xlators/protocol/server/src/server-resolve.c +++ b/xlators/protocol/server/src/server-resolve.c @@ -349,7 +349,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; @@ -457,7 +458,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; diff --git a/xlators/protocol/server/src/server3_1-fops.c b/xlators/protocol/server/src/server3_1-fops.c index c73f3df15be..7748ef81324 100644 --- a/xlators/protocol/server/src/server3_1-fops.c +++ b/xlators/protocol/server/src/server3_1-fops.c @@ -1369,14 +1369,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) -- don't do this without understanding |