diff options
author | Vyacheslav Dubeyko <slava@dubeyko.com> | 2013-08-22 19:35:45 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-23 12:51:22 -0400 |
commit | 4bf93b50fd04118ac7f33a3c2b8a0a1f9fa80bc9 (patch) | |
tree | 46da4b4982c9b6cca343b25c3869bf93a23cbed7 | |
parent | 2df37a19c686c2d7c4e9b4ce1505b5141e3e5552 (diff) |
nilfs2: fix issue with counting number of bio requests for BIO_EOPNOTSUPP error detection
Fix the issue with improper counting number of flying bio requests for
BIO_EOPNOTSUPP error detection case.
The sb_nbio must be incremented exactly the same number of times as
complete() function was called (or will be called) because
nilfs_segbuf_wait() will call wail_for_completion() for the number of
times set to sb_nbio:
do {
wait_for_completion(&segbuf->sb_bio_event);
} while (--segbuf->sb_nbio > 0);
Two functions complete() and wait_for_completion() must be called the
same number of times for the same sb_bio_event. Otherwise,
wait_for_completion() will hang or leak.
Signed-off-by: Vyacheslav Dubeyko <slava@dubeyko.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Tested-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | fs/nilfs2/segbuf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nilfs2/segbuf.c b/fs/nilfs2/segbuf.c index 5bacf46dc4b3..2d8be51f90dc 100644 --- a/fs/nilfs2/segbuf.c +++ b/fs/nilfs2/segbuf.c | |||
@@ -376,12 +376,12 @@ static int nilfs_segbuf_submit_bio(struct nilfs_segment_buffer *segbuf, | |||
376 | bio->bi_private = segbuf; | 376 | bio->bi_private = segbuf; |
377 | bio_get(bio); | 377 | bio_get(bio); |
378 | submit_bio(mode, bio); | 378 | submit_bio(mode, bio); |
379 | segbuf->sb_nbio++; | ||
379 | if (bio_flagged(bio, BIO_EOPNOTSUPP)) { | 380 | if (bio_flagged(bio, BIO_EOPNOTSUPP)) { |
380 | bio_put(bio); | 381 | bio_put(bio); |
381 | err = -EOPNOTSUPP; | 382 | err = -EOPNOTSUPP; |
382 | goto failed; | 383 | goto failed; |
383 | } | 384 | } |
384 | segbuf->sb_nbio++; | ||
385 | bio_put(bio); | 385 | bio_put(bio); |
386 | 386 | ||
387 | wi->bio = NULL; | 387 | wi->bio = NULL; |