diff options
| -rw-r--r-- | fs/lockd/svclock.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index fb1a2bedbe97..8d80c990dffd 100644 --- a/fs/lockd/svclock.c +++ b/fs/lockd/svclock.c | |||
| @@ -289,7 +289,6 @@ static void nlmsvc_free_block(struct kref *kref) | |||
| 289 | dprintk("lockd: freeing block %p...\n", block); | 289 | dprintk("lockd: freeing block %p...\n", block); |
| 290 | 290 | ||
| 291 | /* Remove block from file's list of blocks */ | 291 | /* Remove block from file's list of blocks */ |
| 292 | mutex_lock(&file->f_mutex); | ||
| 293 | list_del_init(&block->b_flist); | 292 | list_del_init(&block->b_flist); |
| 294 | mutex_unlock(&file->f_mutex); | 293 | mutex_unlock(&file->f_mutex); |
| 295 | 294 | ||
| @@ -303,7 +302,7 @@ static void nlmsvc_free_block(struct kref *kref) | |||
| 303 | static void nlmsvc_release_block(struct nlm_block *block) | 302 | static void nlmsvc_release_block(struct nlm_block *block) |
| 304 | { | 303 | { |
| 305 | if (block != NULL) | 304 | if (block != NULL) |
| 306 | kref_put(&block->b_count, nlmsvc_free_block); | 305 | kref_put_mutex(&block->b_count, nlmsvc_free_block, &block->b_file->f_mutex); |
| 307 | } | 306 | } |
| 308 | 307 | ||
| 309 | /* | 308 | /* |
