mirrors/scoutfs
1
0
Fork 0
mirror of https://github.com/versity/scoutfs.git synced 2026-08-15 11:46:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ring block replay

Browse Source 
The ring block replay walk messed up the blkno it read
from and its exit condition.  It needed to test for having
just replayed the tail before moving on.

Signed-off-by: Zach Brown <zab@versity.com>
This commit is contained in:
Zach Brown
2017-04-18 13:42:30 -07:00
parent 21d313e0f6
commit 641aae50ed
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kmod/src/ring.c
+6 -3
View File
@@ -227,7 +227,7 @@ int scoutfs_ring_read(struct super_block *sb)
tail = le64_to_cpu(super->ring_tail_index);
seq = le64_to_cpu(super->ring_head_seq);
do {
for(;;) {
blkno = le64_to_cpu(super->ring_blkno) + index;
if (index <= tail)
@@ -236,7 +236,7 @@ int scoutfs_ring_read(struct super_block *sb)
nr = le64_to_cpu(super->ring_blocks) - index;
nr = min_t(int, nr, NR_BLOCKS);
ret = scoutfs_bio_read(sb, pages, index, nr);
ret = scoutfs_bio_read(sb, pages, blkno, nr);
if (ret)
goto out;
@@ -249,10 +249,13 @@ int scoutfs_ring_read(struct super_block *sb)
goto out;
}
if (index == tail)
break;
index += nr;
if (index == le64_to_cpu(super->ring_blocks))
index = 0;
} while (index != tail);
}
out:
for (i = 0; i < NR_PAGES && pages && pages[i]; i++)