diff options
author | J. Bruce Fields <bfields@redhat.com> | 2010-11-29 15:28:10 -0500 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2010-12-17 15:48:18 -0500 |
commit | 18b631f83810e95eeb2e1839889b27142bd8d6d8 (patch) | |
tree | 88d7e9d207eb478be485c6b6e73708e8bcfde8fe /fs/nfsd/nfs3proc.c | |
parent | e203d506bd221bfa5b3acbb7336ae7b7646636a4 (diff) |
nfsd: fix offset printk's in nfsd3 read/write
Thanks to dysbr01@ca.com for noticing that the debugging printk in
the v3 write procedure can print >2GB offsets as negative numbers:
https://bugzilla.kernel.org/show_bug.cgi?id=23342
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfs3proc.c')
-rw-r--r-- | fs/nfsd/nfs3proc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfsd/nfs3proc.c b/fs/nfsd/nfs3proc.c index 5b7e3021e06b..2247fc91d5e9 100644 --- a/fs/nfsd/nfs3proc.c +++ b/fs/nfsd/nfs3proc.c | |||
@@ -151,10 +151,10 @@ nfsd3_proc_read(struct svc_rqst *rqstp, struct nfsd3_readargs *argp, | |||
151 | __be32 nfserr; | 151 | __be32 nfserr; |
152 | u32 max_blocksize = svc_max_payload(rqstp); | 152 | u32 max_blocksize = svc_max_payload(rqstp); |
153 | 153 | ||
154 | dprintk("nfsd: READ(3) %s %lu bytes at %lu\n", | 154 | dprintk("nfsd: READ(3) %s %lu bytes at %Lu\n", |
155 | SVCFH_fmt(&argp->fh), | 155 | SVCFH_fmt(&argp->fh), |
156 | (unsigned long) argp->count, | 156 | (unsigned long) argp->count, |
157 | (unsigned long) argp->offset); | 157 | (unsigned long long) argp->offset); |
158 | 158 | ||
159 | /* Obtain buffer pointer for payload. | 159 | /* Obtain buffer pointer for payload. |
160 | * 1 (status) + 22 (post_op_attr) + 1 (count) + 1 (eof) | 160 | * 1 (status) + 22 (post_op_attr) + 1 (count) + 1 (eof) |
@@ -191,10 +191,10 @@ nfsd3_proc_write(struct svc_rqst *rqstp, struct nfsd3_writeargs *argp, | |||
191 | __be32 nfserr; | 191 | __be32 nfserr; |
192 | unsigned long cnt = argp->len; | 192 | unsigned long cnt = argp->len; |
193 | 193 | ||
194 | dprintk("nfsd: WRITE(3) %s %d bytes at %ld%s\n", | 194 | dprintk("nfsd: WRITE(3) %s %d bytes at %Lu%s\n", |
195 | SVCFH_fmt(&argp->fh), | 195 | SVCFH_fmt(&argp->fh), |
196 | argp->len, | 196 | argp->len, |
197 | (unsigned long) argp->offset, | 197 | (unsigned long long) argp->offset, |
198 | argp->stable? " stable" : ""); | 198 | argp->stable? " stable" : ""); |
199 | 199 | ||
200 | fh_copy(&resp->fh, &argp->fh); | 200 | fh_copy(&resp->fh, &argp->fh); |