diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-04 23:59:32 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-04 23:59:32 +0100 |
| commit | d5e4cc8faf91bb408fdf2767f73dcfee35e193da (patch) | |
| tree | 44cd8594c67531235d33e4d65394e36d839f1839 /fs/lockd/svclock.c | |
| parent | 7253b85cc62d6ff84143d96fe6cd54f73736f4d7 (diff) | |
| parent | a0d271cbfed1dd50278c6b06bead3d00ba0a88f9 (diff) | |
| download | linux-d5e4cc8faf91bb408fdf2767f73dcfee35e193da.tar.gz linux-d5e4cc8faf91bb408fdf2767f73dcfee35e193da.tar.bz2 linux-d5e4cc8faf91bb408fdf2767f73dcfee35e193da.zip | |
Merge commit 'v3.6' into fixes
Diffstat (limited to 'fs/lockd/svclock.c')
| -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) dprintk("lockd: freeing block %p...\n", block); /* Remove block from file's list of blocks */ - mutex_lock(&file->f_mutex); list_del_init(&block->b_flist); mutex_unlock(&file->f_mutex); @@ -303,7 +302,7 @@ static void nlmsvc_free_block(struct kref *kref) static void nlmsvc_release_block(struct nlm_block *block) { if (block != NULL) - kref_put(&block->b_count, nlmsvc_free_block); + kref_put_mutex(&block->b_count, nlmsvc_free_block, &block->b_file->f_mutex); } /* |