diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2006-02-24 04:06:36 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2006-02-24 04:06:36 -0500 |
| commit | fab8d6ddf6dee2608869005d45fe97f70e4f5bdd (patch) | |
| tree | fecf566e03a87b2a44c7f3363ddb5c0d4bebdca7 /fs/lockd/svcproc.c | |
| parent | 64419d93a5906600af5817ad0cae3c6ecf7fb389 (diff) | |
| parent | f52ee1410d563cd409b08822492273a5bc235821 (diff) | |
Merge branch 'master' of /home/src/linux-2.6/
Diffstat (limited to 'fs/lockd/svcproc.c')
| -rw-r--r-- | fs/lockd/svcproc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c index 3bc437e0cf5b..35681d9cf1fc 100644 --- a/fs/lockd/svcproc.c +++ b/fs/lockd/svcproc.c | |||
| @@ -256,7 +256,7 @@ nlmsvc_proc_granted(struct svc_rqst *rqstp, struct nlm_args *argp, | |||
| 256 | resp->cookie = argp->cookie; | 256 | resp->cookie = argp->cookie; |
| 257 | 257 | ||
| 258 | dprintk("lockd: GRANTED called\n"); | 258 | dprintk("lockd: GRANTED called\n"); |
| 259 | resp->status = nlmclnt_grant(&argp->lock); | 259 | resp->status = nlmclnt_grant(&rqstp->rq_addr, &argp->lock); |
| 260 | dprintk("lockd: GRANTED status %d\n", ntohl(resp->status)); | 260 | dprintk("lockd: GRANTED status %d\n", ntohl(resp->status)); |
| 261 | return rpc_success; | 261 | return rpc_success; |
| 262 | } | 262 | } |