[PATCH] more bio fallout - Kernel

This is a discussion on [PATCH] more bio fallout - Kernel ; Signed-off-by: Al Viro --- diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index 2473e2a..a2da76b 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c @@ -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 ...

+ Reply to Thread
Results 1 to 3 of 3

Thread: [PATCH] more bio fallout

  1. [PATCH] more bio fallout


    Signed-off-by: Al Viro
    ---
    diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
    index 2473e2a..a2da76b 100644
    --- a/fs/gfs2/super.c
    +++ b/fs/gfs2/super.c
    @@ -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)
    diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
    index 3429fa7..bbc588d 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)
    diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c
    index 1332adc..941369c 100644
    --- a/fs/jfs/jfs_metapage.c
    +++ b/fs/jfs/jfs_metapage.c
    @@ -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)
    diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
    index ad6626e..bdf6002 100644
    --- a/fs/ocfs2/cluster/heartbeat.c
    +++ b/fs/ocfs2/cluster/heartbeat.c
    @@ -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
    diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c
    index 3f13519..6f4c29e 100644
    --- a/fs/xfs/linux-2.6/xfs_aops.c
    +++ b/fs/xfs/linux-2.6/xfs_aops.c
    @@ -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
    diff --git a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c
    index 6a75f4d..39f44ee 100644
    --- a/fs/xfs/linux-2.6/xfs_buf.c
    +++ b/fs/xfs/linux-2.6/xfs_buf.c
    @@ -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
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  2. Re: [PATCH] more bio fallout

    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.

    --
    Jens Axboe

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  3. Re: [PATCH] more bio fallout

    On Fri, Oct 12 2007, Jens Axboe wrote:
    > 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).

    --
    Jens Axboe

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

+ Reply to Thread