MD: Move macros from raid1*.h to raid1*.c (473e87ce) · Commits · 戴 / test

drivers/md/raid1.c

+14 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,20 @@
		*/
		#define NR_RAID1_BIOS 256

		/* when we get a read error on a read-only array, we redirect to another
		* device without failing the first device, or trying to over-write to
		* correct the read error. To keep track of bad blocks on a per-bio
		* level, we store IO_BLOCKED in the appropriate 'bios' pointer
		*/
		#define IO_BLOCKED ((struct bio *)1)
		/* When we successfully write to a known bad-block, we need to remove the
		* bad-block marking which must be done from process context. So we record
		* the success by setting devs[n].bio to IO_MADE_GOOD
		*/
		#define IO_MADE_GOOD ((struct bio *)2)

		#define BIO_SPECIAL(bio) ((unsigned long)bio <= 2)

		/* When there are this many requests queue to be written by
		* the raid1 thread, we become 'congested' to provide back-pressure
		* for writeback.

+0 −14

Original line number	Diff line number	Diff line
		@@ -135,20 +135,6 @@ struct r1bio {
		/* DO NOT PUT ANY NEW FIELDS HERE - bios array is contiguously alloced*/
		};

		/* when we get a read error on a read-only array, we redirect to another
		* device without failing the first device, or trying to over-write to
		* correct the read error. To keep track of bad blocks on a per-bio
		* level, we store IO_BLOCKED in the appropriate 'bios' pointer
		*/
		#define IO_BLOCKED ((struct bio *)1)
		/* When we successfully write to a known bad-block, we need to remove the
		* bad-block marking which must be done from process context. So we record
		* the success by setting bios[n] to IO_MADE_GOOD
		*/
		#define IO_MADE_GOOD ((struct bio *)2)

		#define BIO_SPECIAL(bio) ((unsigned long)bio <= 2)

		/* bits for r1bio.state */
		#define R1BIO_Uptodate 0
		#define R1BIO_IsSync 1

+15 −1

Original line number	Diff line number	Diff line
		@@ -60,7 +60,21 @@
		*/
		#define NR_RAID10_BIOS 256

		/* When there are this many requests queue to be written by
		/* when we get a read error on a read-only array, we redirect to another
		* device without failing the first device, or trying to over-write to
		* correct the read error. To keep track of bad blocks on a per-bio
		* level, we store IO_BLOCKED in the appropriate 'bios' pointer
		*/
		#define IO_BLOCKED ((struct bio *)1)
		/* When we successfully write to a known bad-block, we need to remove the
		* bad-block marking which must be done from process context. So we record
		* the success by setting devs[n].bio to IO_MADE_GOOD
		*/
		#define IO_MADE_GOOD ((struct bio *)2)

		#define BIO_SPECIAL(bio) ((unsigned long)bio <= 2)

		/* When there are this many requests queued to be written by
		* the raid10 thread, we become 'congested' to provide back-pressure
		* for writeback.
		*/

+0 −14

Original line number	Diff line number	Diff line
		@@ -123,20 +123,6 @@ struct r10bio {
		} devs[0];
		};

		/* when we get a read error on a read-only array, we redirect to another
		* device without failing the first device, or trying to over-write to
		* correct the read error. To keep track of bad blocks on a per-bio
		* level, we store IO_BLOCKED in the appropriate 'bios' pointer
		*/
		#define IO_BLOCKED ((struct bio*)1)
		/* When we successfully write to a known bad-block, we need to remove the
		* bad-block marking which must be done from process context. So we record
		* the success by setting devs[n].bio to IO_MADE_GOOD
		*/
		#define IO_MADE_GOOD ((struct bio *)2)

		#define BIO_SPECIAL(bio) ((unsigned long)bio <= 2)

		/* bits for r10bio.state */
		enum r10bio_state {
		R10BIO_Uptodate,