Skip to contentSkip to conversation

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

PATCH In review Kinglong Mee 2 participants 2 messages Mar 22, 2015 – Mar 24, 2015

Subsystems (3)
NFS client NFS server Kernel NFSD block and SCSI layout driver
lore
Share & tools
lore

Kinglong Mee

author
#0 lore raw

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

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 <[email protected]>
---
 fs/nfsd/blocklayout.c    | 2 +-
 fs/nfsd/blocklayoutxdr.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
fs/nfsd/blocklayout.c +1 -1
index cdbc78c..03d647b 100644
@@ -137,7 +137,7 @@ nfsd4_block_proc_layoutget(struct inode *inode, const struct svc_fh *fhp,
 	seg->offset = iomap.offset;
 	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;
 
 out_error:
fs/nfsd/blocklayoutxdr.c +3 -3
index 9da89fd..9aa2796 100644
@@ -122,19 +122,19 @@ nfsd4_block_decode_layoutupdate(__be32 *p, u32 len, struct iomap **iomapp,
 
 		p = xdr_decode_hyper(p, &bex.foff);
 		if (bex.foff & (block_size - 1)) {
-			dprintk("%s: unaligned offset %lld\n",
+			dprintk("%s: unaligned offset 0x%llx\n",
 				__func__, bex.foff);
 			goto fail;
 		}
 		p = xdr_decode_hyper(p, &bex.len);
 		if (bex.len & (block_size - 1)) {
-			dprintk("%s: unaligned length %lld\n",
+			dprintk("%s: unaligned length 0x%llx\n",
 				__func__, bex.foff);
 			goto fail;
 		}
 		p = xdr_decode_hyper(p, &bex.soff);
 		if (bex.soff & (block_size - 1)) {
-			dprintk("%s: unaligned disk offset %lld\n",
+			dprintk("%s: unaligned disk offset 0x%llx\n",
 				__func__, bex.soff);
 			goto fail;
 		}
Signature · 1 line
2.3.3
reviewer Reviewed-by on v1 1/1
#1 lore raw
Quoted 3 lines · Kinglong Mee

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"

Looks good,

Reviewed-by Christoph Hellwig <[email protected]>