aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2007-11-21 21:58:56 -0500
committerJ. Bruce Fields <bfields@citi.umich.edu>2008-02-01 16:42:06 -0500
commit5ec7b46c2f4a6f5e136188d598a3f9912ca922e9 (patch)
tree4bfd4cb5faeba04203db8a011f8b358fb719118c
parent99d965eda736b839a63fe85438ee03a0f660053c (diff)
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: J. Bruce Fields <bfields@citi.umich.edu>
-rw-r--r--fs/nfsd/nfs4state.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 60cc937b7076..78b9139cdd0f 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -61,7 +61,6 @@ static time_t lease_time = 90; /* default lease time */
61static time_t user_lease_time = 90; 61static time_t user_lease_time = 90;
62static time_t boot_time; 62static time_t boot_time;
63static int in_grace = 1; 63static int in_grace = 1;
64static u32 current_clientid = 1;
65static u32 current_ownerid = 1; 64static u32 current_ownerid = 1;
66static u32 current_fileid = 1; 65static u32 current_fileid = 1;
67static u32 current_delegid = 1; 66static u32 current_delegid = 1;
@@ -485,8 +484,10 @@ same_creds(struct svc_cred *cr1, struct svc_cred *cr2)
485 return cr1->cr_uid == cr2->cr_uid; 484 return cr1->cr_uid == cr2->cr_uid;
486} 485}
487 486
488static void 487static void gen_clid(struct nfs4_client *clp)
489gen_clid(struct nfs4_client *clp) { 488{
489 static u32 current_clientid = 1;
490
490 clp->cl_clientid.cl_boot = boot_time; 491 clp->cl_clientid.cl_boot = boot_time;
491 clp->cl_clientid.cl_id = current_clientid++; 492 clp->cl_clientid.cl_id = current_clientid++;
492} 493}