|
@@ -722,6 +722,7 @@ void gfs2_clear_rgrpd(struct gfs2_sbd *sdp)
|
|
|
|
|
|
gfs2_free_clones(rgd);
|
|
|
kfree(rgd->rd_bits);
|
|
|
+ rgd->rd_bits = NULL;
|
|
|
return_all_reservations(rgd);
|
|
|
kmem_cache_free(gfs2_rgrpd_cachep, rgd);
|
|
|
}
|
|
@@ -916,9 +917,6 @@ static int read_rindex_entry(struct gfs2_inode *ip)
|
|
|
if (error)
|
|
|
goto fail;
|
|
|
|
|
|
- rgd->rd_gl->gl_object = rgd;
|
|
|
- rgd->rd_gl->gl_vm.start = (rgd->rd_addr * bsize) & PAGE_MASK;
|
|
|
- rgd->rd_gl->gl_vm.end = PAGE_ALIGN((rgd->rd_addr + rgd->rd_length) * bsize) - 1;
|
|
|
rgd->rd_rgl = (struct gfs2_rgrp_lvb *)rgd->rd_gl->gl_lksb.sb_lvbptr;
|
|
|
rgd->rd_flags &= ~(GFS2_RDF_UPTODATE | GFS2_RDF_PREFERRED);
|
|
|
if (rgd->rd_data > sdp->sd_max_rg_data)
|
|
@@ -926,14 +924,20 @@ static int read_rindex_entry(struct gfs2_inode *ip)
|
|
|
spin_lock(&sdp->sd_rindex_spin);
|
|
|
error = rgd_insert(rgd);
|
|
|
spin_unlock(&sdp->sd_rindex_spin);
|
|
|
- if (!error)
|
|
|
+ if (!error) {
|
|
|
+ rgd->rd_gl->gl_object = rgd;
|
|
|
+ rgd->rd_gl->gl_vm.start = (rgd->rd_addr * bsize) & PAGE_MASK;
|
|
|
+ rgd->rd_gl->gl_vm.end = PAGE_ALIGN((rgd->rd_addr +
|
|
|
+ rgd->rd_length) * bsize) - 1;
|
|
|
return 0;
|
|
|
+ }
|
|
|
|
|
|
error = 0; /* someone else read in the rgrp; free it and ignore it */
|
|
|
gfs2_glock_put(rgd->rd_gl);
|
|
|
|
|
|
fail:
|
|
|
kfree(rgd->rd_bits);
|
|
|
+ rgd->rd_bits = NULL;
|
|
|
kmem_cache_free(gfs2_rgrpd_cachep, rgd);
|
|
|
return error;
|
|
|
}
|