gfs2: Improve gfs2_consist_inode() usage

gfs2_consist_inode() logs an error message with the source file and line
number. When we jump before calling it, the line number becomes less
useful as it no longer relates to the source of the error. To aid
troubleshooting, replace the gotos with the gfs2_consist_inode() calls
so that the error messages are more informative.

Signed-off-by: Andrew Price <anprice@redhat.com>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>

diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
index 560e4624c09f2d5e72834c71cb4956d1db509c9f..dbf1aede744c121f1589a06f596c222fe251fb95 100644 (file)
--- a/fs/gfs2/dir.c
+++ b/fs/gfs2/dir.c
@@ -562,15 +562,18 @@ static struct gfs2_dirent *gfs2_dirent_scan(struct inode *inode, void *buf,
        int ret = 0;
 
        ret = gfs2_dirent_offset(GFS2_SB(inode), buf);
-       if (ret < 0)
-               goto consist_inode;
-
+       if (ret < 0) {
+               gfs2_consist_inode(GFS2_I(inode));
+               return ERR_PTR(-EIO);
+       }
        offset = ret;
        prev = NULL;
        dent = buf + offset;
        size = be16_to_cpu(dent->de_rec_len);
-       if (gfs2_check_dirent(GFS2_SB(inode), dent, offset, size, len, 1))
-               goto consist_inode;
+       if (gfs2_check_dirent(GFS2_SB(inode), dent, offset, size, len, 1)) {
+               gfs2_consist_inode(GFS2_I(inode));
+               return ERR_PTR(-EIO);
+       }
        do {
                ret = scan(dent, name, opaque);
                if (ret)
@@ -582,8 +585,10 @@ static struct gfs2_dirent *gfs2_dirent_scan(struct inode *inode, void *buf,
                dent = buf + offset;
                size = be16_to_cpu(dent->de_rec_len);
                if (gfs2_check_dirent(GFS2_SB(inode), dent, offset, size,
-                                     len, 0))
-                       goto consist_inode;
+                                     len, 0)) {
+                       gfs2_consist_inode(GFS2_I(inode));
+                       return ERR_PTR(-EIO);
+               }
        } while(1);
 
        switch(ret) {
@@ -597,10 +602,6 @@ static struct gfs2_dirent *gfs2_dirent_scan(struct inode *inode, void *buf,
                BUG_ON(ret > 0);
                return ERR_PTR(ret);
        }
-
-consist_inode:
-       gfs2_consist_inode(GFS2_I(inode));
-       return ERR_PTR(-EIO);
 }
 
 static int dirent_check_reclen(struct gfs2_inode *dip,
@@ -609,14 +610,16 @@ static int dirent_check_reclen(struct gfs2_inode *dip,
        const void *ptr = d;
        u16 rec_len = be16_to_cpu(d->de_rec_len);
 
-       if (unlikely(rec_len < sizeof(struct gfs2_dirent)))
-               goto broken;
+       if (unlikely(rec_len < sizeof(struct gfs2_dirent))) {
+               gfs2_consist_inode(dip);
+               return -EIO;
+       }
        ptr += rec_len;
        if (ptr < end_p)
                return rec_len;
        if (ptr == end_p)
                return -ENOENT;
-broken:
+
        gfs2_consist_inode(dip);
        return -EIO;
 }

diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
index 45653cbc8a87d15170aa4c52b954043bc858b2d5..ae8d4731907d10d55d3280ee70b43dc494543bed 100644 (file)
--- a/fs/gfs2/glops.c
+++ b/fs/gfs2/glops.c
@@ -409,10 +409,14 @@ static int gfs2_dinode_in(struct gfs2_inode *ip, const void *buf)
        struct inode *inode = &ip->i_inode;
        bool is_new = inode->i_state & I_NEW;
 
-       if (unlikely(ip->i_no_addr != be64_to_cpu(str->di_num.no_addr)))
-               goto corrupt;
-       if (unlikely(!is_new && inode_wrong_type(inode, mode)))
-               goto corrupt;
+       if (unlikely(ip->i_no_addr != be64_to_cpu(str->di_num.no_addr))) {
+               gfs2_consist_inode(ip);
+               return -EIO;
+       }
+       if (unlikely(!is_new && inode_wrong_type(inode, mode))) {
+               gfs2_consist_inode(ip);
+               return -EIO;
+       }
        ip->i_no_formal_ino = be64_to_cpu(str->di_num.no_formal_ino);
        inode->i_mode = mode;
        if (is_new) {
@@ -449,26 +453,28 @@ static int gfs2_dinode_in(struct gfs2_inode *ip, const void *buf)
        /* i_diskflags and i_eattr must be set before gfs2_set_inode_flags() */
        gfs2_set_inode_flags(inode);
        height = be16_to_cpu(str->di_height);
-       if (unlikely(height > sdp->sd_max_height))
-               goto corrupt;
+       if (unlikely(height > sdp->sd_max_height)) {
+               gfs2_consist_inode(ip);
+               return -EIO;
+       }
        ip->i_height = (u8)height;
 
        depth = be16_to_cpu(str->di_depth);
-       if (unlikely(depth > GFS2_DIR_MAX_DEPTH))
-               goto corrupt;
+       if (unlikely(depth > GFS2_DIR_MAX_DEPTH)) {
+               gfs2_consist_inode(ip);
+               return -EIO;
+       }
        ip->i_depth = (u8)depth;
        ip->i_entries = be32_to_cpu(str->di_entries);
 
-       if (gfs2_is_stuffed(ip) && inode->i_size > gfs2_max_stuffed_size(ip))
-               goto corrupt;
-
+       if (gfs2_is_stuffed(ip) && inode->i_size > gfs2_max_stuffed_size(ip)) {
+               gfs2_consist_inode(ip);
+               return -EIO;
+       }
        if (S_ISREG(inode->i_mode))
                gfs2_set_aops(inode);
 
        return 0;
-corrupt:
-       gfs2_consist_inode(ip);
-       return -EIO;
 }
 
 /**

diff --git a/fs/gfs2/xattr.c b/fs/gfs2/xattr.c
index 8c96ba6230d1b9ace38bc09010fd637a89c76238..17ae5070a90e67d3e8f3cb2fbdd8e6e538d1a524 100644 (file)
--- a/fs/gfs2/xattr.c
+++ b/fs/gfs2/xattr.c
@@ -96,30 +96,34 @@ static int ea_foreach_i(struct gfs2_inode *ip, struct buffer_head *bh,
                return -EIO;
 
        for (ea = GFS2_EA_BH2FIRST(bh);; prev = ea, ea = GFS2_EA2NEXT(ea)) {
-               if (!GFS2_EA_REC_LEN(ea))
-                       goto fail;
+               if (!GFS2_EA_REC_LEN(ea)) {
+                       gfs2_consist_inode(ip);
+                       return -EIO;
+               }
                if (!(bh->b_data <= (char *)ea && (char *)GFS2_EA2NEXT(ea) <=
-                                                 bh->b_data + bh->b_size))
-                       goto fail;
-               if (!gfs2_eatype_valid(sdp, ea->ea_type))
-                       goto fail;
+                                                 bh->b_data + bh->b_size)) {
+                       gfs2_consist_inode(ip);
+                       return -EIO;
+               }
+               if (!gfs2_eatype_valid(sdp, ea->ea_type)) {
+                       gfs2_consist_inode(ip);
+                       return -EIO;
+               }
                error = ea_call(ip, bh, ea, prev, data);
                if (error)
                        return error;
 
                if (GFS2_EA_IS_LAST(ea)) {
                        if ((char *)GFS2_EA2NEXT(ea) !=
-                           bh->b_data + bh->b_size)
-                               goto fail;
+                           bh->b_data + bh->b_size) {
+                               gfs2_consist_inode(ip);
+                               return -EIO;
+                       }
                        break;
                }
        }
 
        return error;
-
-fail:
-       gfs2_consist_inode(ip);
-       return -EIO;
 }
 
 static int ea_foreach(struct gfs2_inode *ip, ea_call_t ea_call, void *data)