Commit e7b7cbf6 authored by Andy Adamson's avatar Andy Adamson Committed by Anna Schumaker
Browse files

NFS refactor nfs4_check_serverowner_major_id 



For session trunking, to compare nfs41_exchange_id_res with
existing nfs_client

Signed-off-by: default avatarAndy Adamson <andros@netapp.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 8e548edb

fs/nfs/nfs4client.c

+5 −6
Original line number Diff line number Diff line
@@ -578,17 +578,15 @@ static bool nfs4_match_clientids(u64 a, u64 b) 
 * Returns true if the server major ids match

 */

static bool

nfs4_check_clientid_trunking(struct nfs_client *a, struct nfs_client *b)

nfs4_check_serverowner_major_id(struct nfs41_server_owner *o1,

				struct nfs41_server_owner *o2)

{

	struct nfs41_server_owner *o1 = a->cl_serverowner;

	struct nfs41_server_owner *o2 = b->cl_serverowner;



	if (o1->major_id_sz != o2->major_id_sz)

		goto out_major_mismatch;

	if (memcmp(o1->major_id, o2->major_id, o1->major_id_sz) != 0)

		goto out_major_mismatch;



	dprintk("NFS: --> %s server owners match\n", __func__);

	dprintk("NFS: --> %s server owner major IDs match\n", __func__);

	return true;



out_major_mismatch:
@@ -658,7 +656,8 @@ int nfs41_walk_client_list(struct nfs_client *new, 
		 * client id trunking. In either case, we want to fall back

		 * to using the existing nfs_client.

		 */

		if (!nfs4_check_clientid_trunking(pos, new))

		if (!nfs4_check_serverowner_major_id(pos->cl_serverowner,

						     new->cl_serverowner))

			continue;



		/* Unlike NFSv4.0, we know that NFSv4.1 always uses the