android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFSD: Printk blocklayout length and offset as format 0x%llx

Browse Source 
When testing pnfs with nfsd_debug on, nfsd print a negative number
of layout length and foff in nfsd4_block_proc_layoutget as,
"GET: -xxxx:-xxx 2"

Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Kinglong Mee 2015-03-22 22:16:40 +08:00 committed by J. Bruce Fields
parent 340f0ba1c6
commit 853695230e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nfsd/blocklayout.c
View File

@ -137,7 +137,7 @@ nfsd4_block_proc_layoutget(struct inode *inode, const struct svc_fh *fhp,
seg->offset = iomap.offset; seg->offset = iomap.offset;
seg->length = iomap.length; seg->length = iomap.length;
dprintk("GET: %lld:%lld %d\n", bex->foff, bex->len, bex->es); dprintk("GET: 0x%llx:0x%llx %d\n", bex->foff, bex->len, bex->es);
return 0; return 0;
out_error: out_error:

6
fs/nfsd/blocklayoutxdr.c
View File

@ -122,19 +122,19 @@ nfsd4_block_decode_layoutupdate(__be32 *p, u32 len, struct iomap **iomapp,
p = xdr_decode_hyper(p, &bex.foff); p = xdr_decode_hyper(p, &bex.foff);
if (bex.foff & (block_size - 1)) { if (bex.foff & (block_size - 1)) {
dprintk("%s: unaligned offset %lld\n", dprintk("%s: unaligned offset 0x%llx\n",
__func__, bex.foff); __func__, bex.foff);
goto fail; goto fail;
} }
p = xdr_decode_hyper(p, &bex.len); p = xdr_decode_hyper(p, &bex.len);
if (bex.len & (block_size - 1)) { if (bex.len & (block_size - 1)) {
dprintk("%s: unaligned length %lld\n", dprintk("%s: unaligned length 0x%llx\n",
__func__, bex.foff); __func__, bex.foff);
goto fail; goto fail;
} }
p = xdr_decode_hyper(p, &bex.soff); p = xdr_decode_hyper(p, &bex.soff);
if (bex.soff & (block_size - 1)) { if (bex.soff & (block_size - 1)) {
dprintk("%s: unaligned disk offset %lld\n", dprintk("%s: unaligned disk offset 0x%llx\n",
__func__, bex.soff); __func__, bex.soff);
goto fail; goto fail;
} }