* Copyright (C) 1994 Theodore Ts'o.
*
* %Begin-Header%
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * This file may be redistributed under the terms of the GNU Library
+ * General Public License, version 2.
* %End-Header%
*/
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
-#include <stdlib.h>
#include <fcntl.h>
#include <time.h>
+#if HAVE_SYS_STAT_H
#include <sys/stat.h>
+#endif
+#if HAVE_SYS_TYPES_H
#include <sys/types.h>
+#endif
-#include <linux/ext2_fs.h>
-
+#include "ext2_fs.h"
#include "ext2fs.h"
struct read_bb_record {
* Helper function for ext2fs_read_bb_inode()
*/
#ifdef __TURBOC__
-#pragma argsused
+ #pragma argsused
#endif
static int mark_bad_block(ext2_filsys fs, blk_t *block_nr,
- int blockcnt, void *private)
+ e2_blkcnt_t blockcnt EXT2FS_ATTR((unused)),
+ blk_t ref_block EXT2FS_ATTR((unused)),
+ int ref_offset EXT2FS_ATTR((unused)),
+ void *priv_data)
{
- struct read_bb_record *rb = (struct read_bb_record *) private;
-
+ struct read_bb_record *rb = (struct read_bb_record *) priv_data;
+
if (blockcnt < 0)
return 0;
-
+
+ if ((*block_nr < fs->super->s_first_data_block) ||
+ (*block_nr >= ext2fs_blocks_count(fs->super)))
+ return 0; /* Ignore illegal blocks */
+
rb->err = ext2fs_badblocks_list_add(rb->bb_list, *block_nr);
if (rb->err)
return BLOCK_ABORT;
retval = ext2fs_read_inode(fs, EXT2_BAD_INO, &inode);
if (retval)
return retval;
- numblocks = (inode.i_blocks / (fs->blocksize / 512)) + 20;
+ numblocks = inode.i_blocks;
+ if (!((fs->super->s_feature_ro_compat &
+ EXT4_FEATURE_RO_COMPAT_HUGE_FILE) &&
+ (inode.i_flags & EXT4_HUGE_FILE_FL)))
+ numblocks = numblocks / (fs->blocksize / 512);
+ numblocks += 20;
+ if (numblocks < 50)
+ numblocks = 50;
+ if (numblocks > 50000)
+ numblocks = 500;
retval = ext2fs_badblocks_list_create(bb_list, numblocks);
if (retval)
return retval;
rb.bb_list = *bb_list;
rb.err = 0;
- retval = ext2fs_block_iterate(fs, EXT2_BAD_INO, 0, 0,
- mark_bad_block, &rb);
+ retval = ext2fs_block_iterate2(fs, EXT2_BAD_INO, BLOCK_FLAG_READ_ONLY,
+ 0, mark_bad_block, &rb);
if (retval)
return retval;