diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2007-11-21 21:58:56 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2008-02-01 16:42:06 -0500 |
| commit | 5ec7b46c2f4a6f5e136188d598a3f9912ca922e9 (patch) | |
| tree | 4bfd4cb5faeba04203db8a011f8b358fb719118c /fs | |
| parent | 99d965eda736b839a63fe85438ee03a0f660053c (diff) | |
| download | blackbird-op-linux-5ec7b46c2f4a6f5e136188d598a3f9912ca922e9.tar.gz blackbird-op-linux-5ec7b46c2f4a6f5e136188d598a3f9912ca922e9.zip | |
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 7 |
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 */ static time_t user_lease_time = 90; static time_t boot_time; static int in_grace = 1; -static u32 current_clientid = 1; static u32 current_ownerid = 1; static u32 current_fileid = 1; static u32 current_delegid = 1; @@ -485,8 +484,10 @@ same_creds(struct svc_cred *cr1, struct svc_cred *cr2) return cr1->cr_uid == cr2->cr_uid; } -static void -gen_clid(struct nfs4_client *clp) { +static void gen_clid(struct nfs4_client *clp) +{ + static u32 current_clientid = 1; + clp->cl_clientid.cl_boot = boot_time; clp->cl_clientid.cl_id = current_clientid++; } |
