ocfs2: acknowledge return value of ocfs2_error()

Caveat: This may return -EROFS for a read case, which seems wrong.  This
is happening even without this patch series though.  Should we convert
EROFS to EIO?

Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 8 insertions, 8 deletions

diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index 5997c00a1515..9a0fd494fe74 100644
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -908,32 +908,32 @@ static int ocfs2_validate_extent_block(struct super_block *sb,
          */
 
         if (!OCFS2_IS_VALID_EXTENT_BLOCK(eb)) {
-                ocfs2_error(sb,
+                rc = ocfs2_error(sb,
                             "Extent block #%llu has bad signature %.*s",
                             (unsigned long long)bh->b_blocknr, 7,
                             eb->h_signature);
-                return -EINVAL;
+                goto bail;
         }
 
         if (le64_to_cpu(eb->h_blkno) != bh->b_blocknr) {
-                ocfs2_error(sb,
+                rc = ocfs2_error(sb,
                             "Extent block #%llu has an invalid h_blkno "
                             "of %llu",
                             (unsigned long long)bh->b_blocknr,
                             (unsigned long long)le64_to_cpu(eb->h_blkno));
-                return -EINVAL;
+                goto bail;
         }
 
         if (le32_to_cpu(eb->h_fs_generation) != OCFS2_SB(sb)->fs_generation) {
-                ocfs2_error(sb,
+                rc = ocfs2_error(sb,
                             "Extent block #%llu has an invalid "
                             "h_fs_generation of #%u",
                             (unsigned long long)bh->b_blocknr,
                             le32_to_cpu(eb->h_fs_generation));
-                return -EINVAL;
+                goto bail;
         }
-
-        return 0;
+bail:
+        return rc;
 }
 
 int ocfs2_read_extent_block(struct ocfs2_caching_info *ci, u64 eb_blkno,