diff options
| author | Linus Torvalds | 2020-01-14 09:56:31 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2020-01-14 09:56:31 -0800 |
| commit | e033e7d4a8081852b2cca53e530e2c0f4e6769c0 (patch) | |
| tree | a396fbd9164da534f3b45e8ca95d942c5da78099 /include | |
| parent | 3f1f9a9b715cfa5d9933a024807e32b206775f83 (diff) | |
| parent | f52b83b0b1c40ada38df917973ab719a4a753951 (diff) | |
Merge branch 'dhowells' (patches from DavidH)
Merge misc fixes from David Howells.
Two afs fixes and a key refcounting fix.
* dhowells:
afs: Fix afs_lookup() to not clobber the version on a new dentry
afs: Fix use-after-loss-of-ref
keys: Fix request_key() cache
Diffstat (limited to 'include')
| -rw-r--r-- | include/trace/events/afs.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/include/trace/events/afs.h b/include/trace/events/afs.h index d5ec4fac82ae..564ba1b5cf57 100644 --- a/include/trace/events/afs.h +++ b/include/trace/events/afs.h @@ -915,9 +915,9 @@ TRACE_EVENT(afs_call_state, TRACE_EVENT(afs_lookup, TP_PROTO(struct afs_vnode *dvnode, const struct qstr *name, - struct afs_vnode *vnode), + struct afs_fid *fid), - TP_ARGS(dvnode, name, vnode), + TP_ARGS(dvnode, name, fid), TP_STRUCT__entry( __field_struct(struct afs_fid, dfid ) @@ -928,13 +928,7 @@ TRACE_EVENT(afs_lookup, TP_fast_assign( int __len = min_t(int, name->len, 23); __entry->dfid = dvnode->fid; - if (vnode) { - __entry->fid = vnode->fid; - } else { - __entry->fid.vid = 0; - __entry->fid.vnode = 0; - __entry->fid.unique = 0; - } + __entry->fid = *fid; memcpy(__entry->name, name->name, __len); __entry->name[__len] = 0; ), |