f2fs: unify the error handling of f2fs_is_valid_blkaddr

[linux-2.6-microblaze.git] / fs / f2fs / data.c

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index bd8674b..d9494b5 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -690,10 +690,8 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio)
 
        if (!f2fs_is_valid_blkaddr(fio->sbi, fio->new_blkaddr,
                        fio->is_por ? META_POR : (__is_meta_io(fio) ?
-                       META_GENERIC : DATA_GENERIC_ENHANCE))) {
-               f2fs_handle_error(fio->sbi, ERROR_INVALID_BLKADDR);
+                       META_GENERIC : DATA_GENERIC_ENHANCE)))
                return -EFSCORRUPTED;
-       }
 
        trace_f2fs_submit_page_bio(page, fio);
 
@@ -888,10 +886,8 @@ int f2fs_merge_page_bio(struct f2fs_io_info *fio)
                        fio->encrypted_page : fio->page;
 
        if (!f2fs_is_valid_blkaddr(fio->sbi, fio->new_blkaddr,
-                       __is_meta_io(fio) ? META_GENERIC : DATA_GENERIC)) {
-               f2fs_handle_error(fio->sbi, ERROR_INVALID_BLKADDR);
+                       __is_meta_io(fio) ? META_GENERIC : DATA_GENERIC))
                return -EFSCORRUPTED;
-       }
 
        trace_f2fs_submit_page_bio(page, fio);
 
@@ -1219,8 +1215,6 @@ struct page *f2fs_get_read_data_page(struct inode *inode, pgoff_t index,
                if (!f2fs_is_valid_blkaddr(F2FS_I_SB(inode), dn.data_blkaddr,
                                                DATA_GENERIC_ENHANCE_READ)) {
                        err = -EFSCORRUPTED;
-                       f2fs_handle_error(F2FS_I_SB(inode),
-                                               ERROR_INVALID_BLKADDR);
                        goto put_err;
                }
                goto got_it;
@@ -1246,8 +1240,6 @@ struct page *f2fs_get_read_data_page(struct inode *inode, pgoff_t index,
                                                dn.data_blkaddr,
                                                DATA_GENERIC_ENHANCE)) {
                err = -EFSCORRUPTED;
-               f2fs_handle_error(F2FS_I_SB(inode),
-                                       ERROR_INVALID_BLKADDR);
                goto put_err;
        }
 got_it:
@@ -1578,7 +1570,6 @@ next_block:
        if (!is_hole &&
            !f2fs_is_valid_blkaddr(sbi, blkaddr, DATA_GENERIC_ENHANCE)) {
                err = -EFSCORRUPTED;
-               f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);
                goto sync_out;
        }
 
@@ -2102,8 +2093,6 @@ got_it:
                if (!f2fs_is_valid_blkaddr(F2FS_I_SB(inode), block_nr,
                                                DATA_GENERIC_ENHANCE_READ)) {
                        ret = -EFSCORRUPTED;
-                       f2fs_handle_error(F2FS_I_SB(inode),
-                                               ERROR_INVALID_BLKADDR);
                        goto out;
                }
        } else {
@@ -2641,11 +2630,8 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio)
            f2fs_lookup_read_extent_cache_block(inode, page->index,
                                                &fio->old_blkaddr)) {
                if (!f2fs_is_valid_blkaddr(fio->sbi, fio->old_blkaddr,
-                                               DATA_GENERIC_ENHANCE)) {
-                       f2fs_handle_error(fio->sbi,
-                                               ERROR_INVALID_BLKADDR);
+                                               DATA_GENERIC_ENHANCE))
                        return -EFSCORRUPTED;
-               }
 
                ipu_force = true;
                fio->need_lock = LOCK_DONE;
@@ -2673,7 +2659,6 @@ got_it:
                !f2fs_is_valid_blkaddr(fio->sbi, fio->old_blkaddr,
                                                DATA_GENERIC_ENHANCE)) {
                err = -EFSCORRUPTED;
-               f2fs_handle_error(fio->sbi, ERROR_INVALID_BLKADDR);
                goto out_writepage;
        }
 
@@ -3640,7 +3625,6 @@ repeat:
                if (!f2fs_is_valid_blkaddr(sbi, blkaddr,
                                DATA_GENERIC_ENHANCE_READ)) {
                        err = -EFSCORRUPTED;
-                       f2fs_handle_error(sbi, ERROR_INVALID_BLKADDR);
                        goto fail;
                }
                err = f2fs_submit_page_read(use_cow ?