diff options
Diffstat (limited to 'fs/lockd/svc.c')
| -rw-r--r-- | fs/lockd/svc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c index e94c887da2d7..55505cbe11af 100644 --- a/fs/lockd/svc.c +++ b/fs/lockd/svc.c | |||
| @@ -138,10 +138,6 @@ lockd(void *vrqstp) | |||
| 138 | 138 | ||
| 139 | dprintk("NFS locking service started (ver " LOCKD_VERSION ").\n"); | 139 | dprintk("NFS locking service started (ver " LOCKD_VERSION ").\n"); |
| 140 | 140 | ||
| 141 | if (!nlm_timeout) | ||
| 142 | nlm_timeout = LOCKD_DFLT_TIMEO; | ||
| 143 | nlmsvc_timeout = nlm_timeout * HZ; | ||
| 144 | |||
| 145 | /* | 141 | /* |
| 146 | * The main request loop. We don't terminate until the last | 142 | * The main request loop. We don't terminate until the last |
| 147 | * NFS mount or NFS daemon has gone away. | 143 | * NFS mount or NFS daemon has gone away. |
| @@ -350,6 +346,10 @@ static struct svc_serv *lockd_create_svc(void) | |||
| 350 | printk(KERN_WARNING | 346 | printk(KERN_WARNING |
| 351 | "lockd_up: no pid, %d users??\n", nlmsvc_users); | 347 | "lockd_up: no pid, %d users??\n", nlmsvc_users); |
| 352 | 348 | ||
| 349 | if (!nlm_timeout) | ||
| 350 | nlm_timeout = LOCKD_DFLT_TIMEO; | ||
| 351 | nlmsvc_timeout = nlm_timeout * HZ; | ||
| 352 | |||
| 353 | serv = svc_create(&nlmsvc_program, LOCKD_BUFSIZE, svc_rpcb_cleanup); | 353 | serv = svc_create(&nlmsvc_program, LOCKD_BUFSIZE, svc_rpcb_cleanup); |
| 354 | if (!serv) { | 354 | if (!serv) { |
| 355 | printk(KERN_WARNING "lockd_up: create service failed\n"); | 355 | printk(KERN_WARNING "lockd_up: create service failed\n"); |
