iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md: remove handling of flush_pending in md_submit_flush_data

Browse Source 
None of the functions called between setting flush_pending to 1, and
atomic_dec_and_test can change flush_pending, or will anything
running in any other thread (as ->flush_bio is not NULL).  So the
atomic_dec_and_test will always succeed.
So remove the atomic_sec and the atomic_dec_and_test.

Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
NeilBrown 2010-12-09 15:59:01 +11:00
parent be20e6c67b
commit 2b74e12e56
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/md/md.c
View File

@ -404,8 +404,6 @@ static void md_submit_flush_data(struct work_struct *ws)
mddev_t *mddev = container_of(ws, mddev_t, flush_work); mddev_t *mddev = container_of(ws, mddev_t, flush_work);
struct bio *bio = mddev->flush_bio; struct bio *bio = mddev->flush_bio;
atomic_set(&mddev->flush_pending, 1);
if (bio->bi_size == 0) if (bio->bi_size == 0)
/* an empty barrier - all done */ /* an empty barrier - all done */
bio_endio(bio, 0); bio_endio(bio, 0);
@ -414,10 +412,9 @@ static void md_submit_flush_data(struct work_struct *ws)
if (mddev->pers->make_request(mddev, bio)) if (mddev->pers->make_request(mddev, bio))
generic_make_request(bio); generic_make_request(bio);
} }
if (atomic_dec_and_test(&mddev->flush_pending)) {
mddev->flush_bio = NULL; mddev->flush_bio = NULL;
wake_up(&mddev->sb_wait); wake_up(&mddev->sb_wait);
}
} }
void md_flush_request(mddev_t *mddev, struct bio *bio) void md_flush_request(mddev_t *mddev, struct bio *bio)