Skip to content

Commit

Permalink
nfsd: use service net instead of hard-coded net where possible
Browse files Browse the repository at this point in the history
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
  • Loading branch information
Stanislav Kinsbursky authored and J. Bruce Fields committed Nov 15, 2012
1 parent 621eb19 commit 7f2210f
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions fs/nfsd/nfs4state.c
Original file line number Diff line number Diff line change
Expand Up @@ -2281,7 +2281,7 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp,
nfs4_verifier confirm = setclientid_confirm->sc_confirm;
clientid_t * clid = &setclientid_confirm->sc_clientid;
__be32 status;
struct nfsd_net *nn = net_generic(&init_net, nfsd_net_id);
struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);

if (STALE_CLIENTID(clid, nn))
return nfserr_stale_clientid;
Expand Down Expand Up @@ -3151,7 +3151,7 @@ nfsd4_renew(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
{
struct nfs4_client *clp;
__be32 status;
struct nfsd_net *nn = net_generic(&init_net, nfsd_net_id);
struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);

nfs4_lock_state();
dprintk("process_renew(%08x/%08x): starting\n",
Expand Down Expand Up @@ -4104,7 +4104,7 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
bool new_state = false;
int lkflg;
int err;
struct nfsd_net *nn = net_generic(&init_net, nfsd_net_id);
struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);

dprintk("NFSD: nfsd4_lock: start=%Ld length=%Ld\n",
(long long) lock->lk_offset,
Expand Down Expand Up @@ -4277,7 +4277,7 @@ nfsd4_lockt(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
struct file_lock *file_lock = NULL;
struct nfs4_lockowner *lo;
__be32 status;
struct nfsd_net *nn = net_generic(&init_net, nfsd_net_id);
struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);

if (locks_in_grace(SVC_NET(rqstp)))
return nfserr_grace;
Expand Down Expand Up @@ -4453,7 +4453,7 @@ nfsd4_release_lockowner(struct svc_rqst *rqstp,
struct list_head matches;
unsigned int hashval = ownerstr_hashval(clid->cl_id, owner);
__be32 status;
struct nfsd_net *nn = net_generic(&init_net, nfsd_net_id);
struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);

dprintk("nfsd4_release_lockowner clientid: (%08x/%08x):\n",
clid->cl_boot, clid->cl_id);
Expand Down

0 comments on commit 7f2210f

Please sign in to comment.