diff options
| author | Neil Brown <neilb@suse.de> | 2006-10-04 05:16:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 10:55:19 -0400 |
| commit | 89e63ef609fb0064a47281e31e38010159c32d57 (patch) | |
| tree | fcc1953b65d29caabbb4caf25498f4f160797a70 /include | |
| parent | bc5fea4299b8bda5f73c6f79dc35d388caf8bced (diff) | |
[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 'include')
| -rw-r--r-- | include/linux/lockd/lockd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h index 5920ecaeed66..2909619c0295 100644 --- a/include/linux/lockd/lockd.h +++ b/include/linux/lockd/lockd.h | |||
| @@ -111,7 +111,7 @@ struct nlm_file { | |||
| 111 | struct list_head f_blocks; /* blocked locks */ | 111 | struct list_head f_blocks; /* blocked locks */ |
| 112 | unsigned int f_locks; /* guesstimate # of locks */ | 112 | unsigned int f_locks; /* guesstimate # of locks */ |
| 113 | unsigned int f_count; /* reference count */ | 113 | unsigned int f_count; /* reference count */ |
| 114 | struct semaphore f_sema; /* avoid concurrent access */ | 114 | struct mutex f_mutex; /* avoid concurrent access */ |
| 115 | }; | 115 | }; |
| 116 | 116 | ||
| 117 | /* | 117 | /* |