tree f9d3ac455ea67f1ea23e7e41848ac422506c474b
parent 62de608da0b0ab17d81a233b50d1e952b9816f69
author NeilBrown <neilb@suse.de> 1146510947 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1146532662 -0700

[PATCH] md: Fix 'rdev->nr_pending' count when retrying barrier requests

When retrying a failed BIO_RW_BARRIER request, we need to keep the reference
in ->nr_pending over the whole retry.  Currently, we only hold the reference
if the failed request is the *last* one to finish - which is silly, because it
would normally be the first to finish.

So move the rdev_dec_pending call up into the didn't-fail branch.  As the rdev
isn't used in the later code, calling rdev_dec_pending earlier doesn't hurt.

Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>