ocfs2: acknowledge return value of ocfs2_error()
Subsystems (2)
PATCH 5/28 ocfs2: acknowledge return value of ocfs2_error()
From: Goldwyn Rodrigues <[email protected]>
Subject: 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?
---
fs/ocfs2/alloc.c | 16 +++++++------- fs/ocfs2/dir.c | 25 ++++++++-------------- fs/ocfs2/inode.c | 8 +++---- fs/ocfs2/move_extents.c | 3 -- fs/ocfs2/refcounttree.c | 42 ++++++++++++++++---------------------- fs/ocfs2/suballoc.c | 25 +++++----------------- fs/ocfs2/xattr.c | 15 ++++--------- 7 files changed, 51 insertions(+), 83 deletions(-)
fs/ocfs2/alloc.c renamed from fs/ocfs2/alloc.c~acknowledge-return-value-of-ocfs2_error +8 -8
@@ -908,32 +908,32 @@ static int ocfs2_validate_extent_block(s*/ 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,
fs/ocfs2/dir.c renamed from fs/ocfs2/dir.c~acknowledge-return-value-of-ocfs2_error +9 -16
@@ -480,8 +480,7 @@ static int ocfs2_check_dir_trailer(struc trailer =ocfs2_trailer_from_bh (bh, dir->i_sb);if (!OCFS2_IS_VALID_DIR_TRAILER (trailer)) { - rc = -EINVAL ; - ocfs2_error(dir->i_sb, + rc = ocfs2_error(dir->i_sb, "Invalid dirblock #%llu: " "signature = %.*s\n", (unsigned long long)bh->b_blocknr, 7,
@@ -489,8 +488,7 @@ static int ocfs2_check_dir_trailer(struc goto out; }if (le64_to_cpu (trailer->db_blkno) != bh->b_blocknr) { - rc = -EINVAL ; - ocfs2_error(dir->i_sb, + rc = ocfs2_error(dir->i_sb, "Directory block #%llu has an invalid " "db_blkno of %llu", (unsigned long long)bh->b_blocknr,
@@ -499,8 +497,7 @@ static int ocfs2_check_dir_trailer(struc }if (le64_to_cpu (trailer->db_parent_dinode) !=OCFS2_I (dir)->ip_blkno) { - rc = -EINVAL ; - ocfs2_error(dir->i_sb, + rc = ocfs2_error(dir->i_sb, "Directory block #%llu on dinode " "#%llu has an invalid parent_dinode " "of %llu",
@@ -604,14 +601,13 @@ static int ocfs2_validate_dx_root(struct }if (!OCFS2_IS_VALID_DX_ROOT (dx_root)) { -ocfs2_error (sb, + ret =ocfs2_error (sb,"Dir Index Root # %llu has bad signature %.*s" , (unsigned long long )le64_to_cpu (dx_root->dr_blkno),7 , dx_root->dr_signature); -return -EINVAL ; } -return 0 ; +return ret; } static int ocfs2_read_dx_root(struct inode *dir, struct ocfs2_dinode *di,
@@ -648,12 +644,11 @@ static int ocfs2_validate_dx_leaf(struct }if (!OCFS2_IS_VALID_DX_LEAF (dx_leaf)) { -ocfs2_error (sb,"Dir Index Leaf has bad signature %.*s" , + ret =ocfs2_error (sb,"Dir Index Leaf has bad signature %.*s" ,7 , dx_leaf->dl_signature); -return -EROFS ; } -return 0 ; +return ret; } static int ocfs2_read_dx_leaf(struct inode *dir, u64 blkno,
@@ -812,11 +807,10 @@ static int ocfs2_dx_dir_lookup_rec(struc el = &eb->h_list;if (el->l_tree_depth) { -ocfs2_error (inode->i_sb, + ret =ocfs2_error (inode->i_sb,"Inode %lu has non zero tree depth in " "btree tree block %llu\n" , inode->i_ino, (unsigned long long )eb_bh->b_blocknr); - ret = -EROFS ; goto out; } }
@@ -832,11 +826,10 @@ static int ocfs2_dx_dir_lookup_rec(struc }if (!found) { -ocfs2_error (inode->i_sb,"Inode %lu has bad extent " + ret =ocfs2_error (inode->i_sb,"Inode %lu has bad extent " "record (%u, %u, 0) in btree" , inode->i_ino,le32_to_cpu (rec->e_cpos),ocfs2_rec_clusters (el, rec)); - ret = -EROFS ; goto out; }
fs/ocfs2/inode.c renamed from fs/ocfs2/inode.c~acknowledge-return-value-of-ocfs2_error +4 -4
@@ -1352,21 +1352,21 @@ int ocfs2_validate_inode_block(struct su rc = -EINVAL ;if (!OCFS2_IS_VALID_DINODE (di)) { -ocfs2_error (sb,"Invalid dinode #%llu: signature = %.*s\n" , + rc =ocfs2_error (sb,"Invalid dinode #%llu: signature = %.*s\n" , (unsigned long long )bh->b_blocknr,7 , di->i_signature); goto bail; }if (le64_to_cpu (di->i_blkno) != bh->b_blocknr) { -ocfs2_error (sb,"Invalid dinode #%llu: i_blkno is %llu\n" , + rc =ocfs2_error (sb,"Invalid dinode #%llu: i_blkno is %llu\n" , (unsigned long long )bh->b_blocknr, (unsigned long long )le64_to_cpu (di->i_blkno)); goto bail; }if (!(di->i_flags &cpu_to_le32 (OCFS2_VALID_FL ))) { -ocfs2_error (sb, + rc =ocfs2_error (sb,"Invalid dinode #%llu: OCFS2_VALID_FL not set\n" , (unsigned long long )bh->b_blocknr); goto bail;
@@ -1374,7 +1374,7 @@ int ocfs2_validate_inode_block(struct suif (le32_to_cpu (di->i_fs_generation) !=OCFS2_SB (sb)->fs_generation) { -ocfs2_error (sb, + rc =ocfs2_error (sb,"Invalid dinode #%llu: fs_generation is %u\n" , (unsigned long long )bh->b_blocknr,le32_to_cpu (di->i_fs_generation));
fs/ocfs2/move_extents.c renamed from fs/ocfs2/move_extents.c~acknowledge-return-value-of-ocfs2_error +1 -2
@@ -99,11 +99,10 @@ static int __ocfs2_move_extent(handle_t index =ocfs2_search_extent_list (el, cpos);if (index ==-1 ) { -ocfs2_error (inode->i_sb, + ret =ocfs2_error (inode->i_sb,"Inode %llu has an extent at cpos %u which can no " "longer be found.\n" , (unsigned long long )ino, cpos); - ret = -EROFS ; goto out; }
fs/ocfs2/refcounttree.c renamed from fs/ocfs2/refcounttree.c~acknowledge-return-value-of-ocfs2_error +18 -24
114 lines not on this page · raw message
fs/ocfs2/suballoc.c renamed from fs/ocfs2/suballoc.c~acknowledge-return-value-of-ocfs2_error +6 -19
@@ -171,7 +171,7 @@ static u32 ocfs2_bits_per_group(struct oif (resize) \ mlog(ML_ERROR, fmt "\n", ##__VA_ARGS__); \else \ - ocfs2_error(sb, fmt, ##__VA_ARGS__); \ + return ocfs2_error(sb, fmt, ##__VA_ARGS__); \ }while (0 ) static int ocfs2_validate_gd_self(struct super_block *sb,
@@ -184,7 +184,6 @@ static int ocfs2_validate_gd_self(structdo_error ("Group descriptor #%llu has bad signature %.*s" , (unsigned long long )bh->b_blocknr,7 , gd->bg_signature); -return -EINVAL ; }if (le64_to_cpu (gd->bg_blkno) != bh->b_blocknr) {
@@ -192,7 +191,6 @@ static int ocfs2_validate_gd_self(struct"of %llu" , (unsigned long long )bh->b_blocknr, (unsigned long long)le64_to_cpu(gd->bg_blkno)); -return -EINVAL ; }if (le32_to_cpu (gd->bg_generation) !=OCFS2_SB (sb)->fs_generation) {
@@ -200,7 +198,6 @@ static int ocfs2_validate_gd_self(struct"fs_generation of #%u" , (unsigned long long )bh->b_blocknr, le32_to_cpu(gd->bg_generation)); -return -EINVAL ; }if (le16_to_cpu (gd->bg_free_bits_count) >le16_to_cpu (gd->bg_bits)) {
@@ -209,7 +206,6 @@ static int ocfs2_validate_gd_self(struct (unsigned long long )bh->b_blocknr,le16_to_cpu (gd->bg_bits), le16_to_cpu(gd->bg_free_bits_count)); -return -EINVAL ; }if (le16_to_cpu (gd->bg_bits) > (8 *le16_to_cpu (gd->bg_size))) {
@@ -218,7 +214,6 @@ static int ocfs2_validate_gd_self(struct (unsigned long long )bh->b_blocknr,le16_to_cpu (gd->bg_bits), 8 * le16_to_cpu(gd->bg_size)); -return -EINVAL ; }return 0 ;
@@ -238,7 +233,6 @@ static int ocfs2_validate_gd_parent(stru (unsigned long long )bh->b_blocknr, (unsigned long long )le64_to_cpu (gd->bg_parent_dinode), (unsigned long long)le64_to_cpu(di->i_blkno)); -return -EINVAL ; } max_bits =le16_to_cpu (di->id2.i_chain.cl_cpg) *le16_to_cpu (di->id2.i_chain.cl_bpc);
@@ -246,7 +240,6 @@ static int ocfs2_validate_gd_parent(strudo_error ("Group descriptor #%llu has bit count of %u" , (unsigned long long )bh->b_blocknr,le16_to_cpu (gd->bg_bits)); -return -EINVAL ; }/* In resize, we may meet the case bg_chain == cl_next_free_rec. */
@@ -257,7 +250,6 @@ static int ocfs2_validate_gd_parent(strudo_error ("Group descriptor #%llu has bad chain %u" , (unsigned long long )bh->b_blocknr,le16_to_cpu (gd->bg_chain)); -return -EINVAL ; }return 0 ;
@@ -384,11 +376,10 @@ static int ocfs2_block_group_fill(handlestruct super_block * sb = alloc_inode->i_sb;if (((unsigned long long ) bg_bh->b_blocknr) != group_blkno) { -ocfs2_error (alloc_inode->i_sb,"group block (%llu) != " + status =ocfs2_error (alloc_inode->i_sb,"group block (%llu) != " "b_blocknr (%llu)" , (unsigned long long )group_blkno, (unsigned long long ) bg_bh->b_blocknr); - status = -EIO ; goto bail; }
@@ -834,9 +825,8 @@ static int ocfs2_reserve_suballoc_bits(sBUG_ON (!OCFS2_IS_VALID_DINODE (fe));if (!(fe->i_flags &cpu_to_le32 (OCFS2_CHAIN_FL ))) { -ocfs2_error (alloc_inode->i_sb,"Invalid chain allocator %llu" , + status =ocfs2_error (alloc_inode->i_sb,"Invalid chain allocator %llu" , (unsigned long long )le64_to_cpu (fe->i_blkno)); - status = -EIO ; goto bail; }
@@ -1370,12 +1360,11 @@ int ocfs2_block_group_set_bits(handle_tle16_add_cpu (&bg->bg_free_bits_count, -num_bits);if (le16_to_cpu (bg->bg_free_bits_count) >le16_to_cpu (bg->bg_bits)) { -ocfs2_error (alloc_inode->i_sb,"Group descriptor # %llu has bit" +return ocfs2_error (alloc_inode->i_sb,"Group descriptor # %llu has bit" " count %u but claims %u are freed. num_bits %d" , (unsigned long long )le64_to_cpu (bg->bg_blkno),le16_to_cpu (bg->bg_bits),le16_to_cpu (bg->bg_free_bits_count), num_bits); -return -EROFS ; }while (num_bits--)ocfs2_set_bit (bit_off++, bitmap);
@@ -1905,13 +1894,12 @@ static int ocfs2_claim_suballoc_bits(strif (le32_to_cpu (fe->id1.bitmap1.i_used) >=le32_to_cpu (fe->id1.bitmap1.i_total)) { -ocfs2_error (ac->ac_inode->i_sb, + status =ocfs2_error (ac->ac_inode->i_sb,"Chain allocator dinode %llu has %u used " "bits but only %u total." , (unsigned long long )le64_to_cpu (fe->i_blkno),le32_to_cpu (fe->id1.bitmap1.i_used),le32_to_cpu (fe->id1.bitmap1.i_total)); - status = -EIO ; goto bail; }
@@ -2429,12 +2417,11 @@ static int ocfs2_block_group_clear_bits( }le16_add_cpu (&bg->bg_free_bits_count, num_bits);if (le16_to_cpu (bg->bg_free_bits_count) >le16_to_cpu (bg->bg_bits)) { -ocfs2_error (alloc_inode->i_sb,"Group descriptor # %llu has bit" +return ocfs2_error (alloc_inode->i_sb,"Group descriptor # %llu has bit" " count %u but claims %u are freed. num_bits %d" , (unsigned long long )le64_to_cpu (bg->bg_blkno),le16_to_cpu (bg->bg_bits),le16_to_cpu (bg->bg_free_bits_count), num_bits); -return -EROFS ; }if (undo_fn)
fs/ocfs2/xattr.c renamed from fs/ocfs2/xattr.c~acknowledge-return-value-of-ocfs2_error +5 -10
@@ -499,30 +499,27 @@ static int ocfs2_validate_xattr_block(st*/ if (!OCFS2_IS_VALID_XATTR_BLOCK (xb)) { -ocfs2_error (sb, +return ocfs2_error (sb,"Extended attribute block #%llu has bad " "signature %.*s" , (unsigned long long )bh->b_blocknr,7 , xb->xb_signature); -return -EINVAL ; }if (le64_to_cpu (xb->xb_blkno) != bh->b_blocknr) { -ocfs2_error (sb, +return ocfs2_error (sb,"Extended attribute block #%llu has an " "invalid xb_blkno of %llu" , (unsigned long long )bh->b_blocknr, (unsigned long long )le64_to_cpu (xb->xb_blkno)); -return -EINVAL ; }if (le32_to_cpu (xb->xb_fs_generation) !=OCFS2_SB (sb)->fs_generation) { -ocfs2_error (sb, +return ocfs2_error (sb,"Extended attribute block #%llu has an invalid " "xb_fs_generation of #%u" , (unsigned long long )bh->b_blocknr,le32_to_cpu (xb->xb_fs_generation)); -return -EINVAL ; }return 0 ;
@@ -3694,11 +3691,10 @@ static int ocfs2_xattr_get_rec(struct in el = &eb->h_list;if (el->l_tree_depth) { -ocfs2_error (inode->i_sb, + ret =ocfs2_error (inode->i_sb,"Inode %lu has non zero tree depth in " "xattr tree block %llu\n" , inode->i_ino, (unsigned long long )eb_bh->b_blocknr); - ret = -EROFS ; goto out; } }
@@ -3713,11 +3709,10 @@ static int ocfs2_xattr_get_rec(struct in }if (!e_blkno) { -ocfs2_error (inode->i_sb,"Inode %lu has bad extent " + ret =ocfs2_error (inode->i_sb,"Inode %lu has bad extent " "record (%u, %u, 0) in xattr" , inode->i_ino,le32_to_cpu (rec->e_cpos),ocfs2_rec_clusters (el, rec)); - ret = -EROFS ; goto out; }
_
PATCH 5/28 ocfs2: acknowledge return value of ocfs2_error()
Quoted 6 lines · Andrew Morton
From: Goldwyn Rodrigues <[email protected]>
Subject: ocfs2: acknowledge return value ofocfs2_error()Caveat: This may return
-EROFSfor a read case, which seems wrong. This is happening even without this patch series though. Should we convert EROFS to EIO?
I must be doing something wrong because in the kernels I've looked at, ocfs2_error() is a void function.
--Mark
--
Mark Fasheh
PATCH 5/28 ocfs2: acknowledge return value of ocfs2_error()
Quoted 10 lines · On Fri, 28 Aug 2015 16:20:43 -0700 Mark Fasheh <[email protected]> wrote:
Quoted 6 lines · Andrew Morton
From: Goldwyn Rodrigues <[email protected]>
Subject: ocfs2: acknowledge return value ofocfs2_error()Caveat: This may return
-EROFSfor a read case, which seems wrong. This is happening even without this patch series though. Should we convert EROFS to EIO?I must be doing something wrong because in the kernels I've looked at,
ocfs2_error()is a void function.
The preceding patch (ocfs2: add errors=continue) changed the ocfs2_error() return type.
PATCH 5/28 ocfs2: acknowledge return value of ocfs2_error()
In reply to akpm at linux-foundation.orgQuoted 11 lines · Andrew Morton
From: Goldwyn Rodrigues <[email protected]>
Subject: ocfs2: acknowledge return value ofocfs2_error()Caveat: This may return
-EROFSfor 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 <[email protected]>Cc Mark Fasheh <[email protected]>Cc Joel Becker <[email protected]>Signed-off-by Andrew Morton <[email protected]>
Well I realized that the error was mine and I missed this patch,
--Mark
--
Mark Fasheh