Merge branch 'work.mount' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[mirror_ubuntu-artful-kernel.git] / fs / gfs2 / dir.c

diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
index a5dfff6a033ebdf86ef19f9b00e12853a2c0a202..5ee2e2f8576cd8811509e33769515e3a5a403281 100644 (file)
--- a/fs/gfs2/dir.c
+++ b/fs/gfs2/dir.c
@@ -1443,7 +1443,7 @@ static int gfs2_dir_read_leaf(struct inode *inode, struct dir_context *ctx,
                                                "g.offset (%u)\n",
                                        (unsigned long long)bh->b_blocknr,
                                        entries2, g.offset);
-                                       
+                               gfs2_consist_inode(ip);
                                error = -EIO;
                                goto out_free;
                        }
@@ -1611,6 +1611,7 @@ int gfs2_dir_read(struct inode *inode, struct dir_context *ctx,
                                (unsigned long long)dip->i_no_addr,
                                dip->i_entries,
                                g.offset);
+                       gfs2_consist_inode(dip);
                        error = -EIO;
                        goto out;
                }
@@ -2030,8 +2031,8 @@ static int leaf_dealloc(struct gfs2_inode *dip, u32 index, u32 len,
        gfs2_rlist_alloc(&rlist, LM_ST_EXCLUSIVE);
 
        for (x = 0; x < rlist.rl_rgrps; x++) {
-               struct gfs2_rgrpd *rgd;
-               rgd = rlist.rl_ghs[x].gh_gl->gl_object;
+               struct gfs2_rgrpd *rgd = gfs2_glock2rgrp(rlist.rl_ghs[x].gh_gl);
+
                rg_blocks += rgd->rd_length;
        }