Merge pull request iovisor#1767 from pchaigno/fix-xfsslower

xfsslower: Fix compilation error due to rewriter update
drcwr · May 18, 2018 · 19b7f74 · 19b7f74
2 parents b8fccc5 + 3ba742e
commit 19b7f74
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/tools/xfsslower.py b/tools/xfsslower.py
@@ -187,10 +187,7 @@
  bpf_get_current_comm(&data.task, sizeof(data.task));
 
  // workaround (rewriter should handle file to d_name in one step):
- struct dentry *de = NULL;
- struct qstr qs = {};
- bpf_probe_read(&de, sizeof(de), &valp->fp->f_path.dentry);
- bpf_probe_read(&qs, sizeof(qs), (void *)&de->d_name);
+ struct qstr qs = valp->fp->f_path.dentry->d_name;
  if (qs.len == 0)
  return 0;
  bpf_probe_read(&data.file, sizeof(data.file), (void *)qs.name);

diff --git a/tools/zfsslower.py b/tools/zfsslower.py
@@ -190,11 +190,7 @@
  data.offset = valp->offset;
  bpf_get_current_comm(&data.task, sizeof(data.task));
 
- // workaround (rewriter should handle file to d_name in one step):
- struct dentry *de = NULL;
- struct qstr qs = {};
- bpf_probe_read(&de, sizeof(de), &valp->fp->f_path.dentry);
- bpf_probe_read(&qs, sizeof(qs), (void *)&de->d_name);
+ struct qstr qs = valp->fp->f_path.dentry->d_name;
  if (qs.len == 0)
  return 0;
  bpf_probe_read(&data.file, sizeof(data.file), (void *)qs.name);