diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c index 8312cd2cdae4..2a3b9d10eba7 100644 --- a/fs/gfs2/log.c +++ b/fs/gfs2/log.c @@ -889,7 +889,7 @@ void gfs2_write_log_header(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd, lh->lh_crc = cpu_to_be32(crc); gfs2_log_write(sdp, jd, page, sb->s_blocksize, 0, dblock); - gfs2_log_submit_bio(&jd->jd_log_bio, REQ_OP_WRITE | op_flags); + gfs2_log_submit_write(&jd->jd_log_bio, REQ_OP_WRITE | op_flags); } /** @@ -1096,7 +1096,7 @@ repeat: if (gfs2_withdrawn(sdp)) goto out_withdraw; if (sdp->sd_jdesc) - gfs2_log_submit_bio(&sdp->sd_jdesc->jd_log_bio, REQ_OP_WRITE); + gfs2_log_submit_write(&sdp->sd_jdesc->jd_log_bio, REQ_OP_WRITE); if (gfs2_withdrawn(sdp)) goto out_withdraw; diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c index d27a0b1080a9..aa9e9fe25c2f 100644 --- a/fs/gfs2/lops.c +++ b/fs/gfs2/lops.c @@ -229,7 +229,7 @@ static void gfs2_end_log_write(struct bio *bio) } /** - * gfs2_log_submit_bio - Submit any pending log bio + * gfs2_log_submit_write - Submit a pending log write bio * @biop: Address of the bio pointer * @opf: REQ_OP | op_flags * @@ -237,7 +237,7 @@ static void gfs2_end_log_write(struct bio *bio) * there is no pending bio, then this is a no-op. */ -void gfs2_log_submit_bio(struct bio **biop, blk_opf_t opf) +void gfs2_log_submit_write(struct bio **biop, blk_opf_t opf) { struct bio *bio = *biop; if (bio) { @@ -303,7 +303,7 @@ static struct bio *gfs2_log_get_bio(struct gfs2_sbd *sdp, u64 blkno, nblk >>= sdp->sd_fsb2bb_shift; if (blkno == nblk && !flush) return bio; - gfs2_log_submit_bio(biop, op); + gfs2_log_submit_write(biop, op); } *biop = gfs2_log_alloc_bio(sdp, blkno, end_io); diff --git a/fs/gfs2/lops.h b/fs/gfs2/lops.h index be740bf33666..010a4696406b 100644 --- a/fs/gfs2/lops.h +++ b/fs/gfs2/lops.h @@ -17,7 +17,7 @@ u64 gfs2_log_bmap(struct gfs2_jdesc *jd, unsigned int lbn); void gfs2_log_write(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd, struct page *page, unsigned size, unsigned offset, u64 blkno); -void gfs2_log_submit_bio(struct bio **biop, blk_opf_t opf); +void gfs2_log_submit_write(struct bio **biop, blk_opf_t opf); void gfs2_pin(struct gfs2_sbd *sdp, struct buffer_head *bh); int gfs2_find_jhead(struct gfs2_jdesc *jd, struct gfs2_log_header_host *head);