diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2012-03-21 16:42:14 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2012-03-26 11:48:54 -0400 |
| commit | 1df00640c9111c881633d9b219f18e66c52599ec (patch) | |
| tree | e36d3924d84f47ec93f6650ff1fd5b8ea7d10d24 /fs/lockd/clnt4xdr.c | |
| parent | ab4684d1560f8d77f6ce82bd3f1f82937070d397 (diff) | |
| parent | 5a7c9eec9fde1da0e3adf0a4ddb64ff2a324a492 (diff) | |
Merge nfs containerization work from Trond's tree
The nfs containerization work is a prerequisite for Jeff Layton's reboot
recovery rework.
Diffstat (limited to 'fs/lockd/clnt4xdr.c')
| -rw-r--r-- | fs/lockd/clnt4xdr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/lockd/clnt4xdr.c b/fs/lockd/clnt4xdr.c index f848b52c67b1..3ddcbb1c0a43 100644 --- a/fs/lockd/clnt4xdr.c +++ b/fs/lockd/clnt4xdr.c | |||
| @@ -598,7 +598,7 @@ static struct rpc_procinfo nlm4_procedures[] = { | |||
| 598 | PROC(GRANTED_RES, res, norep), | 598 | PROC(GRANTED_RES, res, norep), |
| 599 | }; | 599 | }; |
| 600 | 600 | ||
| 601 | struct rpc_version nlm_version4 = { | 601 | const struct rpc_version nlm_version4 = { |
| 602 | .number = 4, | 602 | .number = 4, |
| 603 | .nrprocs = ARRAY_SIZE(nlm4_procedures), | 603 | .nrprocs = ARRAY_SIZE(nlm4_procedures), |
| 604 | .procs = nlm4_procedures, | 604 | .procs = nlm4_procedures, |