Commit 40676623 authored by Jan Kara's avatar Jan Kara Committed by Theodore Ts'o
Browse files

ext4: move functions in super.c 



Just move error info related functions in super.c close to
ext4_handle_error(). We'll want to combine save_error_info() with
ext4_handle_error() and this makes change more obvious and saves a
forward declaration as well. No functional change.

Signed-off-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarAndreas Dilger <adilger@dilger.ca>
Link: https://lore.kernel.org/r/20201127113405.26867-6-jack@suse.cz


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 014c9caa

fs/ext4/super.c

+98 −98
Original line number Diff line number Diff line
@@ -423,104 +423,6 @@ static time64_t __ext4_get_tstamp(__le32 *lo, __u8 *hi) 
#define ext4_get_tstamp(es, tstamp) \

	__ext4_get_tstamp(&(es)->tstamp, &(es)->tstamp ## _hi)



static void __save_error_info(struct super_block *sb, int error,

			      __u32 ino, __u64 block,

			      const char *func, unsigned int line)

{

	struct ext4_super_block *es = EXT4_SB(sb)->s_es;

	int err;



	EXT4_SB(sb)->s_mount_state |= EXT4_ERROR_FS;

	if (bdev_read_only(sb->s_bdev))

		return;

	es->s_state |= cpu_to_le16(EXT4_ERROR_FS);

	ext4_update_tstamp(es, s_last_error_time);

	strncpy(es->s_last_error_func, func, sizeof(es->s_last_error_func));

	es->s_last_error_line = cpu_to_le32(line);

	es->s_last_error_ino = cpu_to_le32(ino);

	es->s_last_error_block = cpu_to_le64(block);

	switch (error) {

	case EIO:

		err = EXT4_ERR_EIO;

		break;

	case ENOMEM:

		err = EXT4_ERR_ENOMEM;

		break;

	case EFSBADCRC:

		err = EXT4_ERR_EFSBADCRC;

		break;

	case 0:

	case EFSCORRUPTED:

		err = EXT4_ERR_EFSCORRUPTED;

		break;

	case ENOSPC:

		err = EXT4_ERR_ENOSPC;

		break;

	case ENOKEY:

		err = EXT4_ERR_ENOKEY;

		break;

	case EROFS:

		err = EXT4_ERR_EROFS;

		break;

	case EFBIG:

		err = EXT4_ERR_EFBIG;

		break;

	case EEXIST:

		err = EXT4_ERR_EEXIST;

		break;

	case ERANGE:

		err = EXT4_ERR_ERANGE;

		break;

	case EOVERFLOW:

		err = EXT4_ERR_EOVERFLOW;

		break;

	case EBUSY:

		err = EXT4_ERR_EBUSY;

		break;

	case ENOTDIR:

		err = EXT4_ERR_ENOTDIR;

		break;

	case ENOTEMPTY:

		err = EXT4_ERR_ENOTEMPTY;

		break;

	case ESHUTDOWN:

		err = EXT4_ERR_ESHUTDOWN;

		break;

	case EFAULT:

		err = EXT4_ERR_EFAULT;

		break;

	default:

		err = EXT4_ERR_UNKNOWN;

	}

	es->s_last_error_errcode = err;

	if (!es->s_first_error_time) {

		es->s_first_error_time = es->s_last_error_time;

		es->s_first_error_time_hi = es->s_last_error_time_hi;

		strncpy(es->s_first_error_func, func,

			sizeof(es->s_first_error_func));

		es->s_first_error_line = cpu_to_le32(line);

		es->s_first_error_ino = es->s_last_error_ino;

		es->s_first_error_block = es->s_last_error_block;

		es->s_first_error_errcode = es->s_last_error_errcode;

	}

	/*

	 * Start the daily error reporting function if it hasn't been

	 * started already

	 */

	if (!es->s_error_count)

		mod_timer(&EXT4_SB(sb)->s_err_report, jiffies + 24*60*60*HZ);

	le32_add_cpu(&es->s_error_count, 1);

}



static void save_error_info(struct super_block *sb, int error,

			    __u32 ino, __u64 block,

			    const char *func, unsigned int line)

{

	__save_error_info(sb, error, ino, block, func, line);

	if (!bdev_read_only(sb->s_bdev))

		ext4_commit_super(sb, 1);

}



/*

 * The del_gendisk() function uninitializes the disk-specific data

 * structures, including the bdi structure, without telling anyone
@@ -649,6 +551,104 @@ static bool system_going_down(void) 
		|| system_state == SYSTEM_RESTART;

}



static void __save_error_info(struct super_block *sb, int error,

			      __u32 ino, __u64 block,

			      const char *func, unsigned int line)

{

	struct ext4_super_block *es = EXT4_SB(sb)->s_es;

	int err;



	EXT4_SB(sb)->s_mount_state |= EXT4_ERROR_FS;

	if (bdev_read_only(sb->s_bdev))

		return;

	es->s_state |= cpu_to_le16(EXT4_ERROR_FS);

	ext4_update_tstamp(es, s_last_error_time);

	strncpy(es->s_last_error_func, func, sizeof(es->s_last_error_func));

	es->s_last_error_line = cpu_to_le32(line);

	es->s_last_error_ino = cpu_to_le32(ino);

	es->s_last_error_block = cpu_to_le64(block);

	switch (error) {

	case EIO:

		err = EXT4_ERR_EIO;

		break;

	case ENOMEM:

		err = EXT4_ERR_ENOMEM;

		break;

	case EFSBADCRC:

		err = EXT4_ERR_EFSBADCRC;

		break;

	case 0:

	case EFSCORRUPTED:

		err = EXT4_ERR_EFSCORRUPTED;

		break;

	case ENOSPC:

		err = EXT4_ERR_ENOSPC;

		break;

	case ENOKEY:

		err = EXT4_ERR_ENOKEY;

		break;

	case EROFS:

		err = EXT4_ERR_EROFS;

		break;

	case EFBIG:

		err = EXT4_ERR_EFBIG;

		break;

	case EEXIST:

		err = EXT4_ERR_EEXIST;

		break;

	case ERANGE:

		err = EXT4_ERR_ERANGE;

		break;

	case EOVERFLOW:

		err = EXT4_ERR_EOVERFLOW;

		break;

	case EBUSY:

		err = EXT4_ERR_EBUSY;

		break;

	case ENOTDIR:

		err = EXT4_ERR_ENOTDIR;

		break;

	case ENOTEMPTY:

		err = EXT4_ERR_ENOTEMPTY;

		break;

	case ESHUTDOWN:

		err = EXT4_ERR_ESHUTDOWN;

		break;

	case EFAULT:

		err = EXT4_ERR_EFAULT;

		break;

	default:

		err = EXT4_ERR_UNKNOWN;

	}

	es->s_last_error_errcode = err;

	if (!es->s_first_error_time) {

		es->s_first_error_time = es->s_last_error_time;

		es->s_first_error_time_hi = es->s_last_error_time_hi;

		strncpy(es->s_first_error_func, func,

			sizeof(es->s_first_error_func));

		es->s_first_error_line = cpu_to_le32(line);

		es->s_first_error_ino = es->s_last_error_ino;

		es->s_first_error_block = es->s_last_error_block;

		es->s_first_error_errcode = es->s_last_error_errcode;

	}

	/*

	 * Start the daily error reporting function if it hasn't been

	 * started already

	 */

	if (!es->s_error_count)

		mod_timer(&EXT4_SB(sb)->s_err_report, jiffies + 24*60*60*HZ);

	le32_add_cpu(&es->s_error_count, 1);

}



static void save_error_info(struct super_block *sb, int error,

			    __u32 ino, __u64 block,

			    const char *func, unsigned int line)

{

	__save_error_info(sb, error, ino, block, func, line);

	if (!bdev_read_only(sb->s_bdev))

		ext4_commit_super(sb, 1);

}



/* Deal with the reporting of failure conditions on a filesystem such as

 * inconsistencies detected or read IO failures.

 *

CRA Git | Maintained and supported by SUSTech CRA and CCSE