andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gfid: server resolver changes to use gfid instead of ino/gen

Browse Source 
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
This commit is contained in:
Anand Avati 2010-09-03 14:01:29 +00:00 committed by Vijay Bellur
parent 2c400f60ca
commit 4432f46fa7
2 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
xlators/protocol/server/src/server-resolve.c
View File

@ -330,7 +330,7 @@ resolve_entry_simple (call_frame_t *frame)
this = frame->this;
resolve = state->resolve_now;
parent = inode_get (state->itable, resolve->par, 0);
parent = inode_find (state->itable, resolve->pargfid);
if (!parent) {
/* simple resolution is indecisive. need to perform
deep resolution */
@ -349,16 +349,6 @@ resolve_entry_simple (call_frame_t *frame)
goto out;
}
// if (parent->ino != 1 && parent->generation != resolve->gen) {
if (0) {
/* simple resolution is decisive - request was for a
stale handle */
resolve->op_ret = -1;
resolve->op_errno = ENOENT;
ret = -1;
goto out;
}
/* expected @parent was found from the inode cache */
state->loc_now->parent = inode_ref (parent);
@ -445,11 +435,7 @@ resolve_inode_simple (call_frame_t *frame)
state = CALL_STATE (frame);
resolve = state->resolve_now;
if (resolve->type == RESOLVE_EXACT) {
inode = inode_get (state->itable, resolve->ino, resolve->gen);
} else {
inode = inode_get (state->itable, resolve->ino, 0);
}
inode = inode_find (state->itable, resolve->gfid);
if (!inode) {
resolve->op_ret = -1;
@ -458,14 +444,6 @@ resolve_inode_simple (call_frame_t *frame)
goto out;
}
// if (inode->ino != 1 && inode->generation != resolve->gen) {
if (0) {
resolve->op_ret = -1;
resolve->op_errno = ENOENT;
ret = -1;
goto out;
}
ret = 0;
state->loc_now->inode = inode_ref (inode);
@ -545,11 +523,11 @@ server_resolve (call_frame_t *frame)
server_resolve_fd (frame);
} else if (resolve->par) {
} else if (!uuid_is_null (resolve->pargfid)) {
server_resolve_entry (frame);
} else if (resolve->ino) {
} else if (!uuid_is_null (resolve->gfid)) {
server_resolve_inode (frame);

8
xlators/protocol/server/src/server3_1-fops.c
View File

@ -2886,7 +2886,7 @@ server_create (rpcsvc_request_t *req)
goto out;
}
state->dict = params;
state->params = params;
params->extra_free = buf;
@ -4090,7 +4090,7 @@ server_mknod (rpcsvc_request_t *req)
goto out;
}
state->dict = params;
state->params = params;
params->extra_free = buf;
@ -4179,7 +4179,7 @@ server_mkdir (rpcsvc_request_t *req)
goto out;
}
state->dict = params;
state->params = params;
params->extra_free = buf;
@ -4614,7 +4614,7 @@ server_symlink (rpcsvc_request_t *req)
goto out;
}
state->dict = params;
state->params = params;
params->extra_free = buf;