more bio fallout
Subsystems (4)
PATCH 1/1 more bio fallout
---
fs/gfs2/super.c +0 -1
@@ -169,7 +169,6 @@ static void end_bio_io_page(struct bio *bio, int error)else printk (KERN_WARNING "gfs2: error %d reading superblock\n" , error);unlock_page (page); -return 0 ; }static void gfs2_sb_in (struct gfs2_sb_host *sb,const void *buf)
fs/jfs/jfs_logmgr.c +1 -6
@@ -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)
fs/jfs/jfs_metapage.c +0 -3
@@ -291,8 +291,6 @@ static void metapage_read_end_io(struct bio *bio, int err)dec_io (page, last_read_complete);bio_put (bio); - -return 0 ; }static void remove_from_logsync (struct metapage *mp)
@@ -349,7 +347,6 @@ static void metapage_write_end_io(struct bio *bio, int err) }dec_io (page, last_write_complete);bio_put (bio); -return 0 ; }static int metapage_writepage (struct page *page,struct writeback_control *wbc)
fs/ocfs2/cluster/heartbeat.c +1 -2
@@ -216,7 +216,7 @@ static void o2hb_wait_on_io(struct o2hb_region *reg,wait_for_completion (&wc->wc_io_complete); } -static int o2hb_bio_end_io (struct bio *bio, +static void o2hb_bio_end_io (struct bio *bio,int error) {struct o2hb_bio_wait_ctxt *wc = bio->bi_private;
@@ -228,7 +228,6 @@ static int o2hb_bio_end_io(struct bio *bio,o2hb_bio_wait_dec (wc,1 );bio_put (bio); -return 0 ; }/* Setup a Bio to cover I/O against num_slots slots starting at
fs/xfs/linux-2.6/xfs_aops.c +1 -2
@@ -323,7 +323,7 @@ xfs_iomap_valid(/* * BIO completion handler for buffered IO. */ -STATIC int +STATIC voidxfs_end_bio (struct bio *bio,int error)
@@ -339,7 +339,6 @@ xfs_end_bio(bio_put (bio);xfs_finish_ioend (ioend,0 ); -return 0 ; }STATIC void
fs/xfs/linux-2.6/xfs_buf.c +1 -2
@@ -1103,7 +1103,7 @@ _xfs_buf_ioend( } } -STATIC int +STATIC voidxfs_buf_bio_end_io (struct bio *bio,int error)
@@ -1139,7 +1139,6 @@ xfs_buf_bio_end_io(_xfs_buf_ioend (bp,1 );bio_put (bio); -return 0 ; }STATIC void
On Fri, Oct 12 2007, Al Viro wrote:
Thanks for this and the other patch that Linus already merged, I'll shove this into a git-branch-of-the-day to collect fallout that I'll submit to Linus. Andrew had already notified me of the gfs2/jfs/ocfs2 breakage, but I had naively thought it only affected -mm additions.
Signature · 1 line
Jens Axboe
Quoted 6 lines · Jens Axboe
On Fri, Oct 12 2007, Al Viro wrote:
Thanks for this and the other patch that Linus already merged, I'll shove this into a git-branch-of-the-day to collect fallout that I'll submit to Linus. Andrew had already notified me of the gfs2/jfs/ocfs2 breakage, but I had naively thought it only affected -mm additions.
Oh, and Linus don't apply this one if you beat me to submitting a pull request, the bi_end_io() changes aren't complete (they need bi_size check updated as well).
Signature · 1 line
Jens Axboe