Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...

[mirror_ubuntu-bionic-kernel.git] / fs / gfs2 / lops.c

diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index 3010f9edd177dffeb3e270515a15e643e37bdd22..c8ff7b7954f05d4b82160804ac1bed811bbb8b48 100644 (file)
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
@@ -207,8 +207,11 @@ static void gfs2_end_log_write(struct bio *bio)
        struct page *page;
        int i;
 
-       if (bio->bi_status)
-               fs_err(sdp, "Error %d writing to log\n", bio->bi_status);
+       if (bio->bi_status) {
+               fs_err(sdp, "Error %d writing to journal, jid=%u\n",
+                      bio->bi_status, sdp->sd_jdesc->jd_jid);
+               wake_up(&sdp->sd_logd_waitq);
+       }
 
        bio_for_each_segment_all(bvec, bio, i) {
                page = bvec->bv_page;
@@ -265,7 +268,7 @@ static struct bio *gfs2_log_alloc_bio(struct gfs2_sbd *sdp, u64 blkno)
 
        bio = bio_alloc(GFP_NOIO, BIO_MAX_PAGES);
        bio->bi_iter.bi_sector = blkno * (sb->s_blocksize >> 9);
-       bio->bi_bdev = sb->s_bdev;
+       bio_set_dev(bio, sb->s_bdev);
        bio->bi_end_io = gfs2_end_log_write;
        bio->bi_private = sdp;