From 54e17624aba71163fb3155b99bc63b143385f366 Mon Sep 17 00:00:00 2001 From: Olga Kornievskaia Date: Tue, 6 Mar 2012 13:36:42 -0500 Subject: [PATCH] reverting commit 7485d53f647ddfef49d3278a143fbfe848e3a61a in comparing server identities, in previous commit we removed comparison of the returned clientids. however, running against the emc server, we ran into issues of data servers retuning the same server major, minor, and scope identities but different clientids. we then decided that it's the same data server. --- daemon/namespace.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/daemon/namespace.c b/daemon/namespace.c index d6c9765..52ebfa2 100644 --- a/daemon/namespace.c +++ b/daemon/namespace.c @@ -199,6 +199,9 @@ static int cl_exid_compare( if (strncmp(info->exchangeid->server_scope, client->server->scope, NFS4_OPAQUE_LIMIT) != 0) goto out; + /* match clientid */ + if (info->exchangeid->clientid != client->clnt_id) + goto out; status = NO_ERROR; out: