diff --git a/[refs] b/[refs] index 54d8c37fda11..0255b9fa83bd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4bf311ddfbffe12d41ad1a3c311ab727db6f72cb +refs/heads/master: 634ee0b9f458f3530b9c0ea7e6951dd03db7d678 diff --git a/trunk/fs/gfs2/dir.c b/trunk/fs/gfs2/dir.c index e96b5322c843..f62223b9e53d 100644 --- a/trunk/fs/gfs2/dir.c +++ b/trunk/fs/gfs2/dir.c @@ -1763,9 +1763,8 @@ static int foreach_leaf(struct gfs2_inode *dip, leaf_call_t lc, void *data) if (error) goto out; leaf = (struct gfs2_leaf *)bh->b_data; - brelse(bh); - len = 1 << (dip->i_di.di_depth - be16_to_cpu(leaf->lf_depth)); + brelse(bh); error = lc(dip, index, len, leaf_no, data); if (error) @@ -1781,7 +1780,7 @@ static int foreach_leaf(struct gfs2_inode *dip, leaf_call_t lc, void *data) error = -EIO; } - out: +out: kfree(lp); return error;