diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2018-03-27 16:53:11 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2018-04-03 21:08:14 +0200 |
| commit | f394b62b7b0dd24757e9813e19f4b6091c5a28f6 (patch) | |
| tree | 46ea40dd200ce4ff364e1127fc034c46e86ed702 /fs/nfsd/vfs.c | |
| parent | nfsd: Record request byte count, not count of vectors (diff) | |
| download | linux-f394b62b7b0dd24757e9813e19f4b6091c5a28f6.tar.xz linux-f394b62b7b0dd24757e9813e19f4b6091c5a28f6.zip | |
nfsd: Add "nfsd_" to trace point names
Follow naming convention used in client and in sunrpc layers.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to '')
| -rw-r--r-- | fs/nfsd/vfs.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c index e2eab4c37030..857031952970 100644 --- a/fs/nfsd/vfs.c +++ b/fs/nfsd/vfs.c @@ -1024,27 +1024,27 @@ __be32 nfsd_read(struct svc_rqst *rqstp, struct svc_fh *fhp, struct raparms *ra; __be32 err; - trace_read_start(rqstp, fhp, offset, *count); + trace_nfsd_read_start(rqstp, fhp, offset, *count); err = nfsd_open(rqstp, fhp, S_IFREG, NFSD_MAY_READ, &file); if (err) return err; ra = nfsd_init_raparms(file); - trace_read_opened(rqstp, fhp, offset, *count); + trace_nfsd_read_opened(rqstp, fhp, offset, *count); if (file->f_op->splice_read && test_bit(RQ_SPLICE_OK, &rqstp->rq_flags)) err = nfsd_splice_read(rqstp, file, offset, count); else err = nfsd_readv(file, offset, vec, vlen, count); - trace_read_io_done(rqstp, fhp, offset, *count); + trace_nfsd_read_io_done(rqstp, fhp, offset, *count); if (ra) nfsd_put_raparams(file, ra); fput(file); - trace_read_done(rqstp, fhp, offset, *count); + trace_nfsd_read_done(rqstp, fhp, offset, *count); return err; } @@ -1061,18 +1061,18 @@ nfsd_write(struct svc_rqst *rqstp, struct svc_fh *fhp, loff_t offset, struct file *file = NULL; __be32 err = 0; - trace_write_start(rqstp, fhp, offset, *cnt); + trace_nfsd_write_start(rqstp, fhp, offset, *cnt); err = nfsd_open(rqstp, fhp, S_IFREG, NFSD_MAY_WRITE, &file); if (err) goto out; - trace_write_opened(rqstp, fhp, offset, *cnt); + trace_nfsd_write_opened(rqstp, fhp, offset, *cnt); err = nfsd_vfs_write(rqstp, fhp, file, offset, vec, vlen, cnt, stable); - trace_write_io_done(rqstp, fhp, offset, *cnt); + trace_nfsd_write_io_done(rqstp, fhp, offset, *cnt); fput(file); out: - trace_write_done(rqstp, fhp, offset, *cnt); + trace_nfsd_write_done(rqstp, fhp, offset, *cnt); return err; } |