Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 67173
b: refs/heads/master
c: e30408b
h: refs/heads/master
i:
  67171: bbb2f24
v: v3
  • Loading branch information
Jeff Garzik authored and Linus Torvalds committed Oct 12, 2007
1 parent 4ef9cf4 commit d15017a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ce9d3c9a6a9aef61525be07fe6ba27d937236aa2
refs/heads/master: e30408b2a99cb7b8bf529c7dc2328a19d71894cf
7 changes: 1 addition & 6 deletions trunk/fs/jfs/jfs_logmgr.c
Original file line number Diff line number Diff line change
Expand Up @@ -2162,7 +2162,7 @@ static void lbmStartIO(struct lbuf * bp)
/* check if journaling to disk has been disabled */
if (log->no_integrity) {
bio->bi_size = 0;
lbmIODone(bio, 0, 0);
lbmIODone(bio, 0);
} else {
submit_bio(WRITE_SYNC, bio);
INCREMENT(lmStat.submitted);
Expand Down Expand Up @@ -2234,8 +2234,6 @@ static void lbmIODone(struct bio *bio, int error)

/* wakeup I/O initiator */
LCACHE_WAKEUP(&bp->l_ioevent);

return 0;
}

/*
Expand All @@ -2260,7 +2258,6 @@ static void lbmIODone(struct bio *bio, int error)
if (bp->l_flag & lbmDIRECT) {
LCACHE_WAKEUP(&bp->l_ioevent);
LCACHE_UNLOCK(flags);
return 0;
}

tail = log->wqueue;
Expand Down Expand Up @@ -2339,8 +2336,6 @@ static void lbmIODone(struct bio *bio, int error)

LCACHE_UNLOCK(flags); /* unlock+enable */
}

return 0;
}

int jfsIOWait(void *arg)
Expand Down

0 comments on commit d15017a

Please sign in to comment.