Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 782e3b3b authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

Fix up more bio fallout 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cbd09dbb

fs/gfs2/super.c

+0 −1
Original line number Diff line number Diff line
@@ -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_metapage.c

+0 −3
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ xfs_iomap_valid( 
/*

 * BIO completion handler for buffered IO.

 */

STATIC int

STATIC void

xfs_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
Original line number Diff line number Diff line
@@ -1103,7 +1103,7 @@ _xfs_buf_ioend( 
	}

}



STATIC int

STATIC void

xfs_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