Merge tag 'for-linus-v4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayto...

[sfrench/cifs-2.6.git] / fs / gfs2 / lops.c

diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index 885d36e7a29f4ad44e3b9458c158349776fecd50..3010f9edd177dffeb3e270515a15e643e37bdd22 100644 (file)
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
@@ -71,7 +71,7 @@ static void maybe_release_space(struct gfs2_bufdata *bd)
 {
        struct gfs2_glock *gl = bd->bd_gl;
        struct gfs2_sbd *sdp = gl->gl_name.ln_sbd;
-       struct gfs2_rgrpd *rgd = gl->gl_object;
+       struct gfs2_rgrpd *rgd = gfs2_glock2rgrp(gl);
        unsigned int index = bd->bd_bh->b_blocknr - gl->gl_name.ln_number;
        struct gfs2_bitmap *bi = rgd->rd_bits + index;
 
@@ -134,10 +134,8 @@ static void gfs2_log_incr_head(struct gfs2_sbd *sdp)
        BUG_ON((sdp->sd_log_flush_head == sdp->sd_log_tail) &&
               (sdp->sd_log_flush_head != sdp->sd_log_head));
 
-       if (++sdp->sd_log_flush_head == sdp->sd_jdesc->jd_blocks) {
+       if (++sdp->sd_log_flush_head == sdp->sd_jdesc->jd_blocks)
                sdp->sd_log_flush_head = 0;
-               sdp->sd_log_flush_wrapped = 1;
-       }
 }
 
 static u64 gfs2_log_bmap(struct gfs2_sbd *sdp)
@@ -182,7 +180,7 @@ static void gfs2_end_log_write_bh(struct gfs2_sbd *sdp, struct bio_vec *bvec,
                bh = bh->b_this_page;
        do {
                if (error)
-                       set_buffer_write_io_error(bh);
+                       mark_buffer_write_io_error(bh);
                unlock_buffer(bh);
                next = bh->b_this_page;
                size -= bh->b_size;