diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2016-05-03 01:45:47 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-05-03 01:45:47 +0200 |
| commit | 84695ffee7987ee1e581be4c4696e47e1a29403b (patch) | |
| tree | 78ca09a96ecd6a6b5f4fae744c381968635af68d /include/trace | |
| parent | Linux 4.6-rc3 (diff) | |
| parent | ->getxattr(): pass dentry and inode as separate arguments (diff) | |
| download | linux-84695ffee7987ee1e581be4c4696e47e1a29403b.tar.xz linux-84695ffee7987ee1e581be4c4696e47e1a29403b.zip | |
Merge getxattr prototype change into work.lookups
The rest of work.xattr stuff isn't needed for this branch
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/ext4.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h index 4e4b2fa78609..09c71e9aaebf 100644 --- a/include/trace/events/ext4.h +++ b/include/trace/events/ext4.h @@ -872,7 +872,7 @@ TRACE_EVENT(ext4_sync_file_enter, TP_fast_assign( struct dentry *dentry = file->f_path.dentry; - __entry->dev = d_inode(dentry)->i_sb->s_dev; + __entry->dev = dentry->d_sb->s_dev; __entry->ino = d_inode(dentry)->i_ino; __entry->datasync = datasync; __entry->parent = d_inode(dentry->d_parent)->i_ino; @@ -1451,7 +1451,7 @@ TRACE_EVENT(ext4_unlink_enter, ), TP_fast_assign( - __entry->dev = d_inode(dentry)->i_sb->s_dev; + __entry->dev = dentry->d_sb->s_dev; __entry->ino = d_inode(dentry)->i_ino; __entry->parent = parent->i_ino; __entry->size = d_inode(dentry)->i_size; @@ -1475,7 +1475,7 @@ TRACE_EVENT(ext4_unlink_exit, ), TP_fast_assign( - __entry->dev = d_inode(dentry)->i_sb->s_dev; + __entry->dev = dentry->d_sb->s_dev; __entry->ino = d_inode(dentry)->i_ino; __entry->ret = ret; ), |