diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-07 21:37:34 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-07 21:37:34 (GMT) |
| commit | dc6f962eb5ad728086fcfa9967976e93ed68e0a5 (patch) | |
| tree | d2adb4cd62554b506f1fc84c1264ab3395fa958a /drivers/md/bitmap.c | |
| parent | 61f953cbaae26f930b8d937366270547e08c1290 (diff) | |
| parent | 070dc6dd7103b6b3f7e4d46e754354a5c15f366e (diff) | |
| download | linux-fsl-qoriq-dc6f962eb5ad728086fcfa9967976e93ed68e0a5.tar.xz | |
Merge branch 'for-linus' of git://neil.brown.name/md
* 'for-linus' of git://neil.brown.name/md:
md: resolve confusion of MD_CHANGE_CLEAN
md: don't clear MD_CHANGE_CLEAN in md_update_sb() for external arrays
Move .gitignore from drivers/md to lib/raid6
Diffstat (limited to 'drivers/md/bitmap.c')
| -rw-r--r-- | drivers/md/bitmap.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c index 1ba1e12..ed4900a 100644 --- a/drivers/md/bitmap.c +++ b/drivers/md/bitmap.c @@ -1542,8 +1542,7 @@ void bitmap_cond_end_sync(struct bitmap *bitmap, sector_t sector) atomic_read(&bitmap->mddev->recovery_active) == 0); bitmap->mddev->curr_resync_completed = bitmap->mddev->curr_resync; - if (bitmap->mddev->persistent) - set_bit(MD_CHANGE_CLEAN, &bitmap->mddev->flags); + set_bit(MD_CHANGE_CLEAN, &bitmap->mddev->flags); sector &= ~((1ULL << CHUNK_BLOCK_SHIFT(bitmap)) - 1); s = 0; while (s < sector && s < bitmap->mddev->resync_max_sectors) { |