From 252a8a60ed03a872dbc2399fcc9e25e0cae74f5a Mon Sep 17 00:00:00 2001 From: Boaz Harrosh Date: Wed, 11 Jul 2012 15:27:13 +0300 Subject: [PATCH] --- yaml --- r: 312102 b: refs/heads/master c: 537632e0a54a5355cdd0330911d18c3b773f9cf7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/exofs/ore_raid.c | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index d29d0fcf1fd2..33dc2d752638 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62b62ad873f2accad9222a4d7ffbe1e93f6714c1 +refs/heads/master: 537632e0a54a5355cdd0330911d18c3b773f9cf7 diff --git a/trunk/fs/exofs/ore_raid.c b/trunk/fs/exofs/ore_raid.c index fff2070c6751..5f376d14fdcc 100644 --- a/trunk/fs/exofs/ore_raid.c +++ b/trunk/fs/exofs/ore_raid.c @@ -144,26 +144,26 @@ static void _sp2d_reset(struct __stripe_pages_2d *sp2d, { unsigned data_devs = sp2d->data_devs; unsigned group_width = data_devs + sp2d->parity; - unsigned p; + int p, c; if (!sp2d->needed) return; - for (p = 0; p < sp2d->pages_in_unit; p++) { - struct __1_page_stripe *_1ps = &sp2d->_1p_stripes[p]; - - if (_1ps->write_count < group_width) { - unsigned c; + for (c = data_devs - 1; c >= 0; --c) + for (p = sp2d->pages_in_unit - 1; p >= 0; --p) { + struct __1_page_stripe *_1ps = &sp2d->_1p_stripes[p]; - for (c = 0; c < data_devs; c++) - if (_1ps->page_is_read[c]) { - struct page *page = _1ps->pages[c]; + if (_1ps->page_is_read[c]) { + struct page *page = _1ps->pages[c]; - r4w->put_page(priv, page); - _1ps->page_is_read[c] = false; - } + r4w->put_page(priv, page); + _1ps->page_is_read[c] = false; + } } + for (p = 0; p < sp2d->pages_in_unit; p++) { + struct __1_page_stripe *_1ps = &sp2d->_1p_stripes[p]; + memset(_1ps->pages, 0, group_width * sizeof(*_1ps->pages)); _1ps->write_count = 0; _1ps->tx = NULL;