Merge branch 'for-4.8/core' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / fs / gfs2 / lops.c

diff --git a/fs/gfs2/lops.c b/fs/gfs2/lops.c
index 58d1c98b9d8b59ed2b27a970001bca7ea612645b..49d5a1b61b06920ca35b5b4664a3e8fc1c20aaf3 100644 (file)
--- a/fs/gfs2/lops.c
+++ b/fs/gfs2/lops.c
@@ -537,9 +537,9 @@ static int buf_lo_scan_elements(struct gfs2_jdesc *jd, unsigned int start,
        if (pass != 1 || be32_to_cpu(ld->ld_type) != GFS2_LOG_DESC_METADATA)
                return 0;
 
-       gfs2_replay_incr_blk(sdp, &start);
+       gfs2_replay_incr_blk(jd, &start);
 
-       for (; blks; gfs2_replay_incr_blk(sdp, &start), blks--) {
+       for (; blks; gfs2_replay_incr_blk(jd, &start), blks--) {
                blkno = be64_to_cpu(*ptr++);
 
                jd->jd_found_blocks++;
@@ -695,7 +695,7 @@ static int revoke_lo_scan_elements(struct gfs2_jdesc *jd, unsigned int start,
 
        offset = sizeof(struct gfs2_log_descriptor);
 
-       for (; blks; gfs2_replay_incr_blk(sdp, &start), blks--) {
+       for (; blks; gfs2_replay_incr_blk(jd, &start), blks--) {
                error = gfs2_replay_read_block(jd, start, &bh);
                if (error)
                        return error;
@@ -764,7 +764,6 @@ static int databuf_lo_scan_elements(struct gfs2_jdesc *jd, unsigned int start,
                                    __be64 *ptr, int pass)
 {
        struct gfs2_inode *ip = GFS2_I(jd->jd_inode);
-       struct gfs2_sbd *sdp = GFS2_SB(jd->jd_inode);
        struct gfs2_glock *gl = ip->i_gl;
        unsigned int blks = be32_to_cpu(ld->ld_data1);
        struct buffer_head *bh_log, *bh_ip;
@@ -775,8 +774,8 @@ static int databuf_lo_scan_elements(struct gfs2_jdesc *jd, unsigned int start,
        if (pass != 1 || be32_to_cpu(ld->ld_type) != GFS2_LOG_DESC_JDATA)
                return 0;
 
-       gfs2_replay_incr_blk(sdp, &start);
-       for (; blks; gfs2_replay_incr_blk(sdp, &start), blks--) {
+       gfs2_replay_incr_blk(jd, &start);
+       for (; blks; gfs2_replay_incr_blk(jd, &start), blks--) {
                blkno = be64_to_cpu(*ptr++);
                esc = be64_to_cpu(*ptr++);