korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-15 00:04:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

NFS refactor nfs4_check_serverowner_major_id

Browse Source 
For session trunking, to compare nfs41_exchange_id_res with
existing nfs_client

Signed-off-by: Andy Adamson <andros@netapp.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
This commit is contained in:
Andy Adamson 2016-09-09 09:22:20 -04:00 committed by Anna Schumaker
parent 8e548edb40
commit e7b7cbf662
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/nfs/nfs4client.c
View File

@ -578,17 +578,15 @@ static bool nfs4_match_clientids(u64 a, u64 b)
* Returns true if the server major ids match * Returns true if the server major ids match
*/ */
static bool 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) if (o1->major_id_sz != o2->major_id_sz)
goto out_major_mismatch; goto out_major_mismatch;
if (memcmp(o1->major_id, o2->major_id, o1->major_id_sz) != 0) if (memcmp(o1->major_id, o2->major_id, o1->major_id_sz) != 0)
goto out_major_mismatch; goto out_major_mismatch;
dprintk("NFS: --> %s server owners match\n", __func__); dprintk("NFS: --> %s server owner major IDs match\n", __func__);
return true; return true;
out_major_mismatch: 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 * client id trunking. In either case, we want to fall back
* to using the existing nfs_client. * 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; continue;
/* Unlike NFSv4.0, we know that NFSv4.1 always uses the /* Unlike NFSv4.0, we know that NFSv4.1 always uses the