tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'md-3.4-fixes' of git://neil.brown.name/md

Pull one small fix for md/bitmaps from NeilBrown:
"This fixes a regression that was introduced in the merge window."

* tag 'md-3.4-fixes' of git://neil.brown.name/md:
md/bitmap: fix calculation of 'chunks' - missing shift.

Linus Torvalds 08542241 f4622045

+1 -5
+1 -2
drivers/md/bitmap.c
··· 1727 1727 bitmap->chunkshift = (ffz(~mddev->bitmap_info.chunksize) 1728 1728 - BITMAP_BLOCK_SHIFT); 1729 1729 1730 - /* now that chunksize and chunkshift are set, we can use these macros */ 1731 - chunks = (blocks + bitmap->chunkshift - 1) >> 1730 + chunks = (blocks + (1 << bitmap->chunkshift) - 1) >> 1732 1731 bitmap->chunkshift; 1733 1732 pages = (chunks + PAGE_COUNTER_RATIO - 1) / PAGE_COUNTER_RATIO; 1734 1733
-3
drivers/md/bitmap.h
··· 101 101 102 102 #define BITMAP_BLOCK_SHIFT 9 103 103 104 - /* how many blocks per chunk? (this is variable) */ 105 - #define CHUNK_BLOCK_RATIO(bitmap) ((bitmap)->mddev->bitmap_info.chunksize >> BITMAP_BLOCK_SHIFT) 106 - 107 104 #endif 108 105 109 106 /*