diff options
Diffstat (limited to 'xlators/protocol/server/src')
| -rw-r--r-- | xlators/protocol/server/src/server-resolve.c | 6 | ||||
| -rw-r--r-- | xlators/protocol/server/src/server3_1-fops.c | 8 | 
2 files changed, 4 insertions, 10 deletions
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  | 
