diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-09 10:08:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-08-09 10:08:08 -0700 |
| commit | 4b22e2074195097c9d6bdc688288d12b7b236bae (patch) | |
| tree | 6d5e9391c76e4db80f0efc4d6faa472566ae9933 /fs/afs/cmservice.c | |
| parent | 426b4ca2d6a5ab51f6b6175d06e4f8ddea434cdf (diff) | |
| parent | 2757a4dc184997c66ef1de32636f73b9f21aac14 (diff) | |
| download | linux-4b22e2074195097c9d6bdc688288d12b7b236bae.tar.gz linux-4b22e2074195097c9d6bdc688288d12b7b236bae.tar.bz2 linux-4b22e2074195097c9d6bdc688288d12b7b236bae.zip | |
Merge tag 'afs-fixes-20220802' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
Pull AFS fixes from David Howells:
"Fix AFS refcount handling.
The first patch converts afs to use refcount_t for its refcounts and
the second patch fixes afs_put_call() and afs_put_server() to save the
values they're going to log in the tracepoint before decrementing the
refcount"
* tag 'afs-fixes-20220802' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
afs: Fix access after dec in put functions
afs: Use refcount_t rather than atomic_t
Diffstat (limited to 'fs/afs/cmservice.c')
| -rw-r--r-- | fs/afs/cmservice.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/afs/cmservice.c b/fs/afs/cmservice.c index a3f5de28be79..0a090d614e76 100644 --- a/fs/afs/cmservice.c +++ b/fs/afs/cmservice.c @@ -212,8 +212,8 @@ static void SRXAFSCB_CallBack(struct work_struct *work) * to maintain cache coherency. */ if (call->server) { - trace_afs_server(call->server, - atomic_read(&call->server->ref), + trace_afs_server(call->server->debug_id, + refcount_read(&call->server->ref), atomic_read(&call->server->active), afs_server_trace_callback); afs_break_callbacks(call->server, call->count, call->request); |