diff --git a/[refs] b/[refs] index 36800e4c6c5d..d95b66d857c4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ffb035591f2736921d5dadcf8597bc1da1ba71e5 +refs/heads/master: 8d8fe64237646fdd2c2de2722ec4189a5999119d diff --git a/trunk/fs/jfs/jfs_logmgr.c b/trunk/fs/jfs/jfs_logmgr.c index ccfd02944053..15a3974cdeeb 100644 --- a/trunk/fs/jfs/jfs_logmgr.c +++ b/trunk/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;