pnfs/flexfiles: LAYOUTSTATS ii_count should be ops instead of bytes
authorPeng Tao <tao.peng@primarydata.com>
Mon, 10 Aug 2015 08:47:32 +0000 (16:47 +0800)
committerTrond Myklebust <trond.myklebust@primarydata.com>
Wed, 12 Aug 2015 18:26:17 +0000 (14:26 -0400)
Turned out I misinterpreted the spec...

Cc: Tom Haynes <thomas.haynes@primarydata.com>
Reported-by: Jean Spector <jean@primarydata.com>
Signed-off-by: Peng Tao <tao.peng@primarydata.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
fs/nfs/flexfilelayout/flexfilelayout.c

index b3289d701eea21623f4081fee1b2807e3e2f4b3a..ba74b15bf0ba02541c7c4b9f89f5223db645a615 100644 (file)
@@ -1863,10 +1863,9 @@ ff_layout_mirror_prepare_stats(struct nfs42_layoutstat_args *args,
                memcpy(&devinfo->dev_id, &dev->deviceid, NFS4_DEVICEID4_SIZE);
                devinfo->offset = pls->pls_range.offset;
                devinfo->length = pls->pls_range.length;
-               /* well, we don't really know if IO is continuous or not! */
-               devinfo->read_count = mirror->read_stat.io_stat.bytes_completed;
+               devinfo->read_count = mirror->read_stat.io_stat.ops_completed;
                devinfo->read_bytes = mirror->read_stat.io_stat.bytes_completed;
-               devinfo->write_count = mirror->write_stat.io_stat.bytes_completed;
+               devinfo->write_count = mirror->write_stat.io_stat.ops_completed;
                devinfo->write_bytes = mirror->write_stat.io_stat.bytes_completed;
                devinfo->layout_type = LAYOUT_FLEX_FILES;
                devinfo->layoutstats_encode = ff_layout_encode_layoutstats;