diff options
author | Chuck Lever <chuck.lever@oracle.com> | 2018-03-27 10:53:11 -0400 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2018-04-03 15:08:14 -0400 |
commit | f394b62b7b0dd24757e9813e19f4b6091c5a28f6 (patch) | |
tree | 46ea40dd200ce4ff364e1127fc034c46e86ed702 /fs/nfsd/vfs.c | |
parent | 79e0b4e247b3d1787ade451cc0187e8d3b0e6e53 (diff) |
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 'fs/nfsd/vfs.c')
-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, | |||
1024 | struct raparms *ra; | 1024 | struct raparms *ra; |
1025 | __be32 err; | 1025 | __be32 err; |
1026 | 1026 | ||
1027 | trace_read_start(rqstp, fhp, offset, *count); | 1027 | trace_nfsd_read_start(rqstp, fhp, offset, *count); |
1028 | err = nfsd_open(rqstp, fhp, S_IFREG, NFSD_MAY_READ, &file); | 1028 | err = nfsd_open(rqstp, fhp, S_IFREG, NFSD_MAY_READ, &file); |
1029 | if (err) | 1029 | if (err) |
1030 | return err; | 1030 | return err; |
1031 | 1031 | ||
1032 | ra = nfsd_init_raparms(file); | 1032 | ra = nfsd_init_raparms(file); |
1033 | 1033 | ||
1034 | trace_read_opened(rqstp, fhp, offset, *count); | 1034 | trace_nfsd_read_opened(rqstp, fhp, offset, *count); |
1035 | 1035 | ||
1036 | if (file->f_op->splice_read && test_bit(RQ_SPLICE_OK, &rqstp->rq_flags)) | 1036 | if (file->f_op->splice_read && test_bit(RQ_SPLICE_OK, &rqstp->rq_flags)) |
1037 | err = nfsd_splice_read(rqstp, file, offset, count); | 1037 | err = nfsd_splice_read(rqstp, file, offset, count); |
1038 | else | 1038 | else |
1039 | err = nfsd_readv(file, offset, vec, vlen, count); | 1039 | err = nfsd_readv(file, offset, vec, vlen, count); |
1040 | 1040 | ||
1041 | trace_read_io_done(rqstp, fhp, offset, *count); | 1041 | trace_nfsd_read_io_done(rqstp, fhp, offset, *count); |
1042 | 1042 | ||
1043 | if (ra) | 1043 | if (ra) |
1044 | nfsd_put_raparams(file, ra); | 1044 | nfsd_put_raparams(file, ra); |
1045 | fput(file); | 1045 | fput(file); |
1046 | 1046 | ||
1047 | trace_read_done(rqstp, fhp, offset, *count); | 1047 | trace_nfsd_read_done(rqstp, fhp, offset, *count); |
1048 | 1048 | ||
1049 | return err; | 1049 | return err; |
1050 | } | 1050 | } |
@@ -1061,18 +1061,18 @@ nfsd_write(struct svc_rqst *rqstp, struct svc_fh *fhp, loff_t offset, | |||
1061 | struct file *file = NULL; | 1061 | struct file *file = NULL; |
1062 | __be32 err = 0; | 1062 | __be32 err = 0; |
1063 | 1063 | ||
1064 | trace_write_start(rqstp, fhp, offset, *cnt); | 1064 | trace_nfsd_write_start(rqstp, fhp, offset, *cnt); |
1065 | 1065 | ||
1066 | err = nfsd_open(rqstp, fhp, S_IFREG, NFSD_MAY_WRITE, &file); | 1066 | err = nfsd_open(rqstp, fhp, S_IFREG, NFSD_MAY_WRITE, &file); |
1067 | if (err) | 1067 | if (err) |
1068 | goto out; | 1068 | goto out; |
1069 | 1069 | ||
1070 | trace_write_opened(rqstp, fhp, offset, *cnt); | 1070 | trace_nfsd_write_opened(rqstp, fhp, offset, *cnt); |
1071 | err = nfsd_vfs_write(rqstp, fhp, file, offset, vec, vlen, cnt, stable); | 1071 | err = nfsd_vfs_write(rqstp, fhp, file, offset, vec, vlen, cnt, stable); |
1072 | trace_write_io_done(rqstp, fhp, offset, *cnt); | 1072 | trace_nfsd_write_io_done(rqstp, fhp, offset, *cnt); |
1073 | fput(file); | 1073 | fput(file); |
1074 | out: | 1074 | out: |
1075 | trace_write_done(rqstp, fhp, offset, *cnt); | 1075 | trace_nfsd_write_done(rqstp, fhp, offset, *cnt); |
1076 | return err; | 1076 | return err; |
1077 | } | 1077 | } |
1078 | 1078 | ||