diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2023-06-23 16:58:19 -0700 |
---|---|---|
committer | Andrew Morton <akpm@linux-foundation.org> | 2023-06-23 16:58:19 -0700 |
commit | 63773d2b593d86440c3b96fd300ed80d00cd06ef (patch) | |
tree | ebc7b1e8f1c0ce535ef9c6120209d0e87d8d4b16 /include/trace | |
parent | cf01724e2d73a90524450e3dd8798cfb9d7aca05 (diff) | |
parent | 814bc1de03ea4361101408e63a68e4b82aef22cb (diff) | |
download | lwn-63773d2b593d86440c3b96fd300ed80d00cd06ef.tar.gz lwn-63773d2b593d86440c3b96fd300ed80d00cd06ef.zip |
Merge mm-hotfixes-stable into mm-stable to pick up depended-upon changes.
Diffstat (limited to 'include/trace')
-rw-r--r-- | include/trace/events/writeback.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/trace/events/writeback.h b/include/trace/events/writeback.h index 86b2a82da546..54e353c9f919 100644 --- a/include/trace/events/writeback.h +++ b/include/trace/events/writeback.h @@ -68,7 +68,7 @@ DECLARE_EVENT_CLASS(writeback_folio_template, strscpy_pad(__entry->name, bdi_dev_name(mapping ? inode_to_bdi(mapping->host) : NULL), 32); - __entry->ino = mapping ? mapping->host->i_ino : 0; + __entry->ino = (mapping && mapping->host) ? mapping->host->i_ino : 0; __entry->index = folio->index; ), |