|
 |
87e7ef |
commit 0c68adcd91cc40e825cfa5a7def29de4ac76b1f1
|
|
|
87e7ef |
Author: Frank Ch. Eigler <fche@redhat.com>
|
|
|
87e7ef |
Date: Thu Aug 29 18:18:59 2019 -0400
|
|
|
87e7ef |
|
|
|
87e7ef |
rhbz1731333: nfsd.proc.write, tolerate awol 'vlen'
|
|
|
87e7ef |
|
|
|
87e7ef |
This variable has disappeared from the kernel via commit
|
|
|
87e7ef |
8154ef2776aa512a3eaa0e7db030dc4803354d61. Substitute a 0.
|
|
|
87e7ef |
|
|
|
87e7ef |
diff --git a/tapset/linux/nfsd.stp b/tapset/linux/nfsd.stp
|
|
|
87e7ef |
index aa04f24..5a77f4e 100644
|
|
|
87e7ef |
--- a/tapset/linux/nfsd.stp
|
|
|
87e7ef |
+++ b/tapset/linux/nfsd.stp
|
|
|
87e7ef |
@@ -638,14 +638,14 @@ probe nfsd.proc2.write = kernel.function("nfsd_proc_write") !,
|
|
|
87e7ef |
count = @nfsd2_writeargs($rqstp->rq_argp)->len
|
|
|
87e7ef |
offset = @nfsd2_writeargs($rqstp->rq_argp)->offset
|
|
|
87e7ef |
vec = $rqstp->rq_vec
|
|
|
87e7ef |
- vlen = @nfsd2_writeargs($rqstp->rq_argp)->vlen
|
|
|
87e7ef |
+ vlen = @choose_defined(@nfsd2_writeargs($rqstp->rq_argp)->vlen, 0)
|
|
|
87e7ef |
}
|
|
|
87e7ef |
else {
|
|
|
87e7ef |
fh = & @nfsd2_writeargs($argp)->fh
|
|
|
87e7ef |
count = $argp->len
|
|
|
87e7ef |
offset = $argp->offset
|
|
|
87e7ef |
vec = @choose_defined($rqstp->rq_vec, $argp->vec)
|
|
|
87e7ef |
- vlen = $argp->vlen
|
|
|
87e7ef |
+ vlen = @choose_defined($argp->vlen, 0)
|
|
|
87e7ef |
}
|
|
|
87e7ef |
|
|
|
87e7ef |
stable = 1 # hardcoded in nfsd_proc_write()
|
|
|
87e7ef |
@@ -691,7 +691,7 @@ probe nfsd.proc3.write = kernel.function("nfsd3_proc_write") !,
|
|
|
87e7ef |
count = @nfsd3_writeargs($rqstp->rq_argp)->count
|
|
|
87e7ef |
offset = @nfsd3_writeargs($rqstp->rq_argp)->offset
|
|
|
87e7ef |
vec = $rqstp->rq_vec
|
|
|
87e7ef |
- vlen = @nfsd3_writeargs($rqstp->rq_argp)->vlen
|
|
|
87e7ef |
+ vlen = @choose_defined(@nfsd3_writeargs($rqstp->rq_argp)->vlen, 0)
|
|
|
87e7ef |
stable = @nfsd3_writeargs($rqstp->rq_argp)->stable
|
|
|
87e7ef |
}
|
|
|
87e7ef |
else {
|
|
|
87e7ef |
@@ -699,7 +699,7 @@ probe nfsd.proc3.write = kernel.function("nfsd3_proc_write") !,
|
|
|
87e7ef |
count = $argp->count
|
|
|
87e7ef |
offset = $argp->offset
|
|
|
87e7ef |
vec = @choose_defined($rqstp->rq_vec, $argp->vec)
|
|
|
87e7ef |
- vlen = $argp->vlen
|
|
|
87e7ef |
+ vlen = @choose_defined($argp->vlen, 0)
|
|
|
87e7ef |
stable = $argp->stable
|
|
|
87e7ef |
}
|
|
|
87e7ef |
|