diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-10-18 09:43:37 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-10-18 09:43:37 +0200 |
| commit | b5bc8ac25aa1477fee3853718f2673a594efdc4b (patch) | |
| tree | dcee1a7ae080d573c12a4a0411b9417746ffd343 /include/trace/events/cachefiles.h | |
| parent | 1f8818e352f721c49ebea39025f6c98f25756eff (diff) | |
| parent | 519d81956ee277b4419c723adfb154603c2565ba (diff) | |
Merge 5.15-rc6 into driver-core-next
We need the driver-core fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/trace/events/cachefiles.h')
| -rw-r--r-- | include/trace/events/cachefiles.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/trace/events/cachefiles.h b/include/trace/events/cachefiles.h index 695bfdbfdcad..920b6a303d60 100644 --- a/include/trace/events/cachefiles.h +++ b/include/trace/events/cachefiles.h @@ -178,7 +178,7 @@ TRACE_EVENT(cachefiles_unlink, ), TP_fast_assign( - __entry->obj = obj->fscache.debug_id; + __entry->obj = obj ? obj->fscache.debug_id : UINT_MAX; __entry->de = de; __entry->why = why; ), @@ -205,7 +205,7 @@ TRACE_EVENT(cachefiles_rename, ), TP_fast_assign( - __entry->obj = obj->fscache.debug_id; + __entry->obj = obj ? obj->fscache.debug_id : UINT_MAX; __entry->de = de; __entry->to = to; __entry->why = why; |