Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85369523 authored Mar 22, 2015 by Kinglong Mee Committed by J. Bruce Fields Mar 25, 2015

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 <kinglongmee@gmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

parent 340f0ba1

fs/nfsd/blocklayout.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -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;
		}