|
@@ -535,9 +535,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)
|
|
if (pass != 1 || be32_to_cpu(ld->ld_type) != GFS2_LOG_DESC_METADATA)
|
|
return 0;
|
|
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++);
|
|
blkno = be64_to_cpu(*ptr++);
|
|
|
|
|
|
jd->jd_found_blocks++;
|
|
jd->jd_found_blocks++;
|
|
@@ -693,7 +693,7 @@ static int revoke_lo_scan_elements(struct gfs2_jdesc *jd, unsigned int start,
|
|
|
|
|
|
offset = sizeof(struct gfs2_log_descriptor);
|
|
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);
|
|
error = gfs2_replay_read_block(jd, start, &bh);
|
|
if (error)
|
|
if (error)
|
|
return error;
|
|
return error;
|
|
@@ -762,7 +762,6 @@ static int databuf_lo_scan_elements(struct gfs2_jdesc *jd, unsigned int start,
|
|
__be64 *ptr, int pass)
|
|
__be64 *ptr, int pass)
|
|
{
|
|
{
|
|
struct gfs2_inode *ip = GFS2_I(jd->jd_inode);
|
|
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;
|
|
struct gfs2_glock *gl = ip->i_gl;
|
|
unsigned int blks = be32_to_cpu(ld->ld_data1);
|
|
unsigned int blks = be32_to_cpu(ld->ld_data1);
|
|
struct buffer_head *bh_log, *bh_ip;
|
|
struct buffer_head *bh_log, *bh_ip;
|
|
@@ -773,8 +772,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)
|
|
if (pass != 1 || be32_to_cpu(ld->ld_type) != GFS2_LOG_DESC_JDATA)
|
|
return 0;
|
|
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++);
|
|
blkno = be64_to_cpu(*ptr++);
|
|
esc = be64_to_cpu(*ptr++);
|
|
esc = be64_to_cpu(*ptr++);
|
|
|
|
|