diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /fs/lockd/host.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'fs/lockd/host.c')
| -rw-r--r-- | fs/lockd/host.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/lockd/host.c b/fs/lockd/host.c index 4600c2037b8b..bb464d12104c 100644 --- a/fs/lockd/host.c +++ b/fs/lockd/host.c | |||
| @@ -479,8 +479,8 @@ again: mutex_lock(&nlm_host_mutex); | |||
| 479 | } | 479 | } |
| 480 | } | 480 | } |
| 481 | } | 481 | } |
| 482 | |||
| 483 | mutex_unlock(&nlm_host_mutex); | 482 | mutex_unlock(&nlm_host_mutex); |
| 483 | nsm_release(nsm); | ||
| 484 | } | 484 | } |
| 485 | 485 | ||
| 486 | /* | 486 | /* |