From 1b4bab3217b9d9a7610979b4304e2cdb2e42d900 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Thu, 8 Dec 2016 23:43:54 -0800 Subject: [PATCH] Fix ring read nr/part confusion Some parts of the ring reading were still using the old 'nr' for the number of blocks to read, but it's now the total number of blocks in the ring. Use part instead. Signed-off-by: Zach Brown --- kmod/src/ring.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kmod/src/ring.c b/kmod/src/ring.c index bc5e7db7..050fa49c 100644 --- a/kmod/src/ring.c +++ b/kmod/src/ring.c @@ -258,15 +258,15 @@ int scoutfs_ring_read(struct super_block *sb) part = min3(nr, (u64)NR_BLOCKS, le64_to_cpu(super->ring_blocks) - index); - trace_printk("index %llu nr %llu\n", index, nr); + trace_printk("index %llu part %llu\n", index, part); - ret = scoutfs_bio_read(sb, pages, blkno, nr); + ret = scoutfs_bio_read(sb, pages, blkno, part); if (ret) goto out; /* XXX verify block header */ - for (i = 0; i < nr; i++) { + for (i = 0; i < part; i++) { ring = scoutfs_page_block_address(pages, i); ret = read_entries(sb, ring); if (ret)