Commit c70810b3 authored by NeilBrown's avatar NeilBrown Committed by Linus Torvalds
Browse files

[PATCH] md: reformat code in raid1_end_write_request to avoid goto 



A recent change made this goto unnecessary, so reformat the code to make it
clearer what is happening.

Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 72d94861

drivers/md/raid1.c

+17 −17
Original line number Diff line number Diff line
@@ -374,10 +374,9 @@ static int raid1_end_write_request(struct bio *bio, unsigned int bytes_done, int 
	 * already.

	 */

	if (atomic_dec_and_test(&r1_bio->remaining)) {

		if (test_bit(R1BIO_BarrierRetry, &r1_bio->state)) {

		if (test_bit(R1BIO_BarrierRetry, &r1_bio->state))

			reschedule_retry(r1_bio);

			goto out;

		}

		else {

			/* it really is the end of this request */

			if (test_bit(R1BIO_BehindIO, &r1_bio->state)) {

				/* free extra copy of the data pages */
@@ -393,7 +392,8 @@ static int raid1_end_write_request(struct bio *bio, unsigned int bytes_done, int 
			md_write_end(r1_bio->mddev);

			raid_end_bio_io(r1_bio);

		}

 out:

	}



	if (to_put)

		bio_put(to_put);