diff options
| author | David Howells <dhowells@redhat.com> | 2019-05-11 00:14:41 +0200 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2019-05-16 17:25:21 +0200 |
| commit | fd711586bb7d63f257da5eff234e68c446ac35ea (patch) | |
| tree | 843b8000ed1df14647a708dde3f161e1a510a37b /fs/afs | |
| parent | afs: Fix lock-wait/callback-break double locking (diff) | |
| download | linux-fd711586bb7d63f257da5eff234e68c446ac35ea.tar.xz linux-fd711586bb7d63f257da5eff234e68c446ac35ea.zip | |
afs: Fix double inc of vnode->cb_break
When __afs_break_callback() clears the CB_PROMISED flag, it increments
vnode->cb_break to trigger a future refetch of the status and callback -
however it also calls afs_clear_permits(), which also increments
vnode->cb_break.
Fix this by removing the increment from afs_clear_permits().
Whilst we're at it, fix the conditional call to afs_put_permits() as the
function checks to see if the argument is NULL, so the check is redundant.
Fixes: be080a6f43c4 ("afs: Overhaul permit caching");
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'fs/afs')
| -rw-r--r-- | fs/afs/security.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/afs/security.c b/fs/afs/security.c index 5f58a9a17e69..db5529e47eb8 100644 --- a/fs/afs/security.c +++ b/fs/afs/security.c @@ -87,11 +87,9 @@ void afs_clear_permits(struct afs_vnode *vnode) permits = rcu_dereference_protected(vnode->permit_cache, lockdep_is_held(&vnode->lock)); RCU_INIT_POINTER(vnode->permit_cache, NULL); - vnode->cb_break++; spin_unlock(&vnode->lock); - if (permits) - afs_put_permits(permits); + afs_put_permits(permits); } /* |