diff --git a/[refs] b/[refs] index 00bcafcc9a21..983278e46c28 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 13d921e37174e3d1042deeb303537c1d935da553 +refs/heads/master: f75bbfb4dda68c86eb33cde7e2b5c1343c6d5812 diff --git a/trunk/fs/gfs2/rgrp.c b/trunk/fs/gfs2/rgrp.c index 8ec41744594b..1daf8a78c733 100644 --- a/trunk/fs/gfs2/rgrp.c +++ b/trunk/fs/gfs2/rgrp.c @@ -329,17 +329,16 @@ static inline int rgrp_contains_block(struct gfs2_rgrpd *rgd, u64 block) struct gfs2_rgrpd *gfs2_blk2rgrpd(struct gfs2_sbd *sdp, u64 blk) { - struct rb_node **newn, *parent = NULL; + struct rb_node **newn; + struct gfs2_rgrpd *cur; spin_lock(&sdp->sd_rindex_spin); newn = &sdp->sd_rindex_tree.rb_node; while (*newn) { - struct gfs2_rgrpd *cur = rb_entry(*newn, struct gfs2_rgrpd, - rd_node); - parent = *newn; + cur = rb_entry(*newn, struct gfs2_rgrpd, rd_node); if (blk < cur->rd_addr) newn = &((*newn)->rb_left); - else if (blk > cur->rd_data0 + cur->rd_data) + else if (blk >= cur->rd_data0 + cur->rd_data) newn = &((*newn)->rb_right); else { spin_unlock(&sdp->sd_rindex_spin);