Re: [PATCH Version 4 03/10] NFS refactor nfs4_check_serverowner_major_id

[Anna Schumaker <Anna.Schumaker@netapp.com>]

Hi Andy,

On 05/11/2016 03:08 PM, andros@netapp.com wrote:
> From: Andy Adamson <andros@netapp.com>
> 
> For session trunking, to compare nfs41_exchange_id_res with
> existing nfs_client
> 
> Signed-off-by: Andy Adamson <andros@netapp.com>
> ---
>  fs/nfs/nfs4client.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
> index c9177a4..5a14fda 100644
> --- a/fs/nfs/nfs4client.c
> +++ b/fs/nfs/nfs4client.c
> @@ -578,11 +578,9 @@ 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)
>  {

It looks like you update the dprintk() in this function with the next patch.  Can you please update it in this one, instead?

Thanks,
Anna

> -	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)
> @@ -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
>