The patch titled Subject: fs/reiserfs/journal.c: fix sparse context imbalance warning has been added to the -mm tree. Its filename is fs-reiserfs-journalc-fix-sparse-context-imbalance-warning.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/fs-reiserfs-journalc-fix-sparse-context-imbalance-warning.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/fs-reiserfs-journalc-fix-sparse-context-imbalance-warning.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Fabian Frederick <fabf@xxxxxxxxx> Subject: 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@xxxxxxxxx> Cc: Jeff Mahoney <jeffm@xxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/reiserfs/journal.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff -puN fs/reiserfs/journal.c~fs-reiserfs-journalc-fix-sparse-context-imbalance-warning fs/reiserfs/journal.c --- a/fs/reiserfs/journal.c~fs-reiserfs-journalc-fix-sparse-context-imbalance-warning +++ a/fs/reiserfs/journal.c @@ -699,11 +699,13 @@ static int add_to_chunk(struct buffer_ch chunk->bh[chunk->nr++] = bh; if (chunk->nr >= CHUNK_SIZE) { ret = 1; - if (lock) + if (lock) { spin_unlock(lock); - fn(chunk); - if (lock) + fn(chunk); spin_lock(lock); + } else { + fn(chunk); + } } return ret; } _ Patches currently in -mm which might be from fabf@xxxxxxxxx are origin.patch fs-cifs-remove-obsolete-__constant.patch fs-cifs-filec-replace-countsize-kzalloc-by-kcalloc.patch fs-cifs-smb2filec-replace-countsize-kzalloc-by-kcalloc.patch kernel-posix-timersc-code-clean-up.patch kernel-posix-timersc-code-clean-up-checkpatch-fixes.patch fs-ext4-fsyncc-generic_file_fsync-call-based-on-barrier-flag.patch fs-reiserfs-journalc-fix-sparse-context-imbalance-warning.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html