|
 |
e4e640 |
commit 8bc64034509474bee3fb7996b2a9e74c8bc27281
|
|
|
e4e640 |
Author: Frank Ch. Eigler <fche@redhat.com>
|
|
|
e4e640 |
Date: Fri Oct 19 17:36:04 2018 -0400
|
|
|
e4e640 |
|
|
|
e4e640 |
nfsd tapset: adapt nfsd.proc4.read probe to different kernel versions
|
|
|
e4e640 |
|
|
|
e4e640 |
Here too an if(@defined($u)) is appropriate, just like in the .write case.
|
|
|
e4e640 |
|
|
|
e4e640 |
diff --git a/tapset/linux/nfsd.stp b/tapset/linux/nfsd.stp
|
|
|
e4e640 |
index 2fe9b0f..674e3e3 100644
|
|
|
e4e640 |
--- a/tapset/linux/nfsd.stp
|
|
|
e4e640 |
+++ b/tapset/linux/nfsd.stp
|
|
|
e4e640 |
@@ -567,10 +567,17 @@ probe nfsd.proc4.read = kernel.function("nfsd4_read").call !,
|
|
|
e4e640 |
version = 4
|
|
|
e4e640 |
fh = & @nfsd4_compound_state($cstate)->current_fh
|
|
|
e4e640 |
|
|
|
e4e640 |
- count = $read->rd_length
|
|
|
e4e640 |
- offset = $read->rd_offset
|
|
|
e4e640 |
- vec = $rqstp->rq_vec
|
|
|
e4e640 |
- vlen = $read->rd_vlen
|
|
|
e4e640 |
+ if (@defined($u)) {
|
|
|
e4e640 |
+ count = $u->read->rd_length
|
|
|
e4e640 |
+ offset = $u->read->rd_offset
|
|
|
e4e640 |
+ vec = $rqstp->rq_vec
|
|
|
e4e640 |
+ vlen = $u->read->rd_vlen
|
|
|
e4e640 |
+ } else {
|
|
|
e4e640 |
+ count = $read->rd_length
|
|
|
e4e640 |
+ offset = $read->rd_offset
|
|
|
e4e640 |
+ vec = $rqstp->rq_vec
|
|
|
e4e640 |
+ vlen = $read->rd_vlen
|
|
|
e4e640 |
+ }
|
|
|
e4e640 |
|
|
|
e4e640 |
uid = __rqstp_uid($rqstp)
|
|
|
e4e640 |
gid = __rqstp_gid($rqstp)
|
|
|
e4e640 |
|
|
|
e4e640 |
commit 4e81610ae8c233d876f378cca8374e34cc2ee0e8
|
|
|
e4e640 |
Author: Frank Ch. Eigler <fche@redhat.com>
|
|
|
e4e640 |
Date: Fri Oct 19 19:31:31 2018 -0400
|
|
|
e4e640 |
|
|
|
e4e640 |
nfsd tapset: adapt nfsd.proc4.commit probe to different kernel versions
|
|
|
e4e640 |
|
|
|
e4e640 |
Here too an if(@defined($u)) is appropriate, just like in
|
|
|
e4e640 |
every other case. Audited remainder.
|
|
|
e4e640 |
|
|
|
e4e640 |
diff --git a/tapset/linux/nfsd.stp b/tapset/linux/nfsd.stp
|
|
|
e4e640 |
index 674e3e3..aa04f24 100644
|
|
|
e4e640 |
--- a/tapset/linux/nfsd.stp
|
|
|
e4e640 |
+++ b/tapset/linux/nfsd.stp
|
|
|
e4e640 |
@@ -852,8 +852,13 @@ probe nfsd.proc4.commit = kernel.function("nfsd4_commit").call !,
|
|
|
e4e640 |
proto = $rqstp->rq_prot
|
|
|
e4e640 |
version = 4
|
|
|
e4e640 |
fh = & @nfsd4_compound_state($cstate)->current_fh
|
|
|
e4e640 |
- count = $commit->co_count
|
|
|
e4e640 |
- offset = $commit->co_offset
|
|
|
e4e640 |
+ if (@defined($u)) {
|
|
|
e4e640 |
+ count = $u->commit->co_count
|
|
|
e4e640 |
+ offset = $u->commit->co_offset
|
|
|
e4e640 |
+ } else {
|
|
|
e4e640 |
+ count = $commit->co_count
|
|
|
e4e640 |
+ offset = $commit->co_offset
|
|
|
e4e640 |
+ }
|
|
|
e4e640 |
|
|
|
e4e640 |
uid = __rqstp_uid($rqstp)
|
|
|
e4e640 |
gid = __rqstp_gid($rqstp)
|