diff options
| author | Neil Brown <neilb@suse.de> | 2006-10-04 13:16:06 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 18:55:19 +0400 |
| commit | 89e63ef609fb0064a47281e31e38010159c32d57 (patch) | |
| tree | fcc1953b65d29caabbb4caf25498f4f160797a70 /fs/lockd/svcsubs.c | |
| parent | bc5fea4299b8bda5f73c6f79dc35d388caf8bced (diff) | |
| download | linux-89e63ef609fb0064a47281e31e38010159c32d57.tar.xz | |
[PATCH] Convert lockd to use the newer mutex instead of the older semaphore
Both the (recently introduces) nsm_sema and the older f_sema are converted
over.
Cc: Olaf Kirch <okir@suse.de>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/lockd/svcsubs.c')
| -rw-r--r-- | fs/lockd/svcsubs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/lockd/svcsubs.c b/fs/lockd/svcsubs.c index a1c7c0848415..514f5f20701e 100644 --- a/fs/lockd/svcsubs.c +++ b/fs/lockd/svcsubs.c @@ -106,7 +106,7 @@ nlm_lookup_file(struct svc_rqst *rqstp, struct nlm_file **result, goto out_unlock; memcpy(&file->f_handle, f, sizeof(struct nfs_fh)); - init_MUTEX(&file->f_sema); + mutex_init(&file->f_mutex); INIT_HLIST_NODE(&file->f_list); INIT_LIST_HEAD(&file->f_blocks); |