2007-10-12 04:01:31

by Jeff Garzik

Subject: [PATCH] JFS: fix bio-related build breakage

Signed-off-by: Jeff Garzik <[email protected]>

diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
index 57c3b8a..ccfd029 100644
--- a/fs/jfs/jfs_logmgr.c
+++ b/fs/jfs/jfs_logmgr.c
@@ -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);
@@ -2234,8 +2234,6 @@ static void lbmIODone(struct bio *bio, int error)

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

/*
@@ -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;
@@ -2339,8 +2336,6 @@ static void lbmIODone(struct bio *bio, int error)

LCACHE_UNLOCK(flags); /* unlock+enable */
}
-
- return 0;
}

int jfsIOWait(void *arg)

2007-10-12 14:27:40

by Dave Kleikamp

Subject: Re: [PATCH] JFS: fix bio-related build breakage

I'd say add my ack, but I see it's already been picked up.

Thanks,
Shaggy

On Fri, 2007-10-12 at 00:01 -0400, Jeff Garzik wrote:
> Signed-off-by: Jeff Garzik <[email protected]>
>
> diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
> index 57c3b8a..ccfd029 100644
> --- a/fs/jfs/jfs_logmgr.c
> +++ b/fs/jfs/jfs_logmgr.c
> @@ -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);
> @@ -2234,8 +2234,6 @@ static void lbmIODone(struct bio *bio, int error)
>
> /* wakeup I/O initiator */
> LCACHE_WAKEUP(&bp->l_ioevent);
> -
> - return 0;
> }
>
> /*
> @@ -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;
> @@ -2339,8 +2336,6 @@ static void lbmIODone(struct bio *bio, int error)
>
> LCACHE_UNLOCK(flags); /* unlock+enable */
> }
> -
> - return 0;
> }
>
> int jfsIOWait(void *arg)
--
David Kleikamp
IBM Linux Technology Center