Commit 5ec7b46c authored by J. Bruce Fields's avatar J. Bruce Fields

nfsd4: make current_clientid local

Declare this variable in the one function where it's used, and clean up
some minor style problems.
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 99d965ed
...@@ -61,7 +61,6 @@ static time_t lease_time = 90; /* default lease time */ ...@@ -61,7 +61,6 @@ static time_t lease_time = 90; /* default lease time */
static time_t user_lease_time = 90; static time_t user_lease_time = 90;
static time_t boot_time; static time_t boot_time;
static int in_grace = 1; static int in_grace = 1;
static u32 current_clientid = 1;
static u32 current_ownerid = 1; static u32 current_ownerid = 1;
static u32 current_fileid = 1; static u32 current_fileid = 1;
static u32 current_delegid = 1; static u32 current_delegid = 1;
...@@ -485,8 +484,10 @@ same_creds(struct svc_cred *cr1, struct svc_cred *cr2) ...@@ -485,8 +484,10 @@ same_creds(struct svc_cred *cr1, struct svc_cred *cr2)
return cr1->cr_uid == cr2->cr_uid; return cr1->cr_uid == cr2->cr_uid;
} }
static void static void gen_clid(struct nfs4_client *clp)
gen_clid(struct nfs4_client *clp) { {
static u32 current_clientid = 1;
clp->cl_clientid.cl_boot = boot_time; clp->cl_clientid.cl_boot = boot_time;
clp->cl_clientid.cl_id = current_clientid++; clp->cl_clientid.cl_id = current_clientid++;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment