Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/olof/pasemi...

[mv-sheeva.git] / fs / jfs / jfs_logmgr.c

diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
index ccfd02944053b3178c4cbcab5604ef4621e6a2e4..15a3974cdeeb1f478cb4040e47b80a61994a6ca5 100644 (file)
--- a/fs/jfs/jfs_logmgr.c
+++ b/fs/jfs/jfs_logmgr.c
@@ -2234,6 +2234,8 @@ static void lbmIODone(struct bio *bio, int error)
 
                /* wakeup I/O initiator */
                LCACHE_WAKEUP(&bp->l_ioevent);
+
+               return;
        }
 
        /*
@@ -2258,6 +2260,7 @@ static void lbmIODone(struct bio *bio, int error)
        if (bp->l_flag & lbmDIRECT) {
                LCACHE_WAKEUP(&bp->l_ioevent);
                LCACHE_UNLOCK(flags);
+               return;
        }
 
        tail = log->wqueue;