diff options
author | Fabian Frederick <fabf@skynet.be> | 2014-10-13 18:53:29 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-13 20:18:20 -0400 |
commit | 54cc6cea73bb5ddf0362a70ef58816898bfb7f87 (patch) | |
tree | 19245a625a45f333483ffe0a12e4c2071d3a9562 /fs/reiserfs | |
parent | 35c0b380d81bd566c37a252399f008928ef4b2cd (diff) |
fs/reiserfs/journal.c: fix sparse context imbalance warning
Merge conditional unlock/lock in the same condition to avoid sparse
warning:
fs/reiserfs/journal.c:703:36: warning: context imbalance in 'add_to_chunk' - unexpected unlock
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/reiserfs')
-rw-r--r-- | fs/reiserfs/journal.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c index a88b1b3e7db3..d571e173a990 100644 --- a/fs/reiserfs/journal.c +++ b/fs/reiserfs/journal.c | |||
@@ -699,11 +699,13 @@ static int add_to_chunk(struct buffer_chunk *chunk, struct buffer_head *bh, | |||
699 | chunk->bh[chunk->nr++] = bh; | 699 | chunk->bh[chunk->nr++] = bh; |
700 | if (chunk->nr >= CHUNK_SIZE) { | 700 | if (chunk->nr >= CHUNK_SIZE) { |
701 | ret = 1; | 701 | ret = 1; |
702 | if (lock) | 702 | if (lock) { |
703 | spin_unlock(lock); | 703 | spin_unlock(lock); |
704 | fn(chunk); | 704 | fn(chunk); |
705 | if (lock) | ||
706 | spin_lock(lock); | 705 | spin_lock(lock); |
706 | } else { | ||
707 | fn(chunk); | ||
708 | } | ||
707 | } | 709 | } |
708 | return ret; | 710 | return ret; |
709 | } | 711 | } |