ext4: add ext4_emergency_state() helper function

Since both SHUTDOWN and EMERGENCY_RO are emergency states of the ext4 file
system, and they are checked in similar locations, we have added a helper
function, ext4_emergency_state(), to determine whether the current file
system is in one of these two emergency states.

Then, replace calls to ext4_forced_shutdown() with ext4_emergency_state()
in those functions that could potentially trigger write operations.

Signed-off-by: Baokun Li <libaokun1@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Zhang Yi <yi.zhang@huawei.com>
Link: https://patch.msgid.link/20250122114130.229709-4-libaokun@huaweicloud.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Baokun Li 2025-01-22 19:41:26 +08:00 committed by Theodore Ts'o
parent f3054e53c2
commit 0a1b2f5ea9
12 changed files with 91 additions and 61 deletions

View File

@ -2252,6 +2252,15 @@ static inline int ext4_emergency_ro(struct super_block *sb)
return test_bit(EXT4_FLAGS_EMERGENCY_RO, &EXT4_SB(sb)->s_ext4_flags); return test_bit(EXT4_FLAGS_EMERGENCY_RO, &EXT4_SB(sb)->s_ext4_flags);
} }
static inline int ext4_emergency_state(struct super_block *sb)
{
if (unlikely(ext4_forced_shutdown(sb)))
return -EIO;
if (unlikely(ext4_emergency_ro(sb)))
return -EROFS;
return 0;
}
/* /*
* Default values for user and/or group using reserved blocks * Default values for user and/or group using reserved blocks
*/ */

View File

@ -63,12 +63,14 @@ static void ext4_put_nojournal(handle_t *handle)
*/ */
static int ext4_journal_check_start(struct super_block *sb) static int ext4_journal_check_start(struct super_block *sb)
{ {
int ret;
journal_t *journal; journal_t *journal;
might_sleep(); might_sleep();
if (unlikely(ext4_forced_shutdown(sb))) ret = ext4_emergency_state(sb);
return -EIO; if (unlikely(ret))
return ret;
if (WARN_ON_ONCE(sb_rdonly(sb))) if (WARN_ON_ONCE(sb_rdonly(sb)))
return -EROFS; return -EROFS;

View File

@ -688,10 +688,12 @@ ext4_dax_write_iter(struct kiocb *iocb, struct iov_iter *from)
static ssize_t static ssize_t
ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from) ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
{ {
int ret;
struct inode *inode = file_inode(iocb->ki_filp); struct inode *inode = file_inode(iocb->ki_filp);
if (unlikely(ext4_forced_shutdown(inode->i_sb))) ret = ext4_emergency_state(inode->i_sb);
return -EIO; if (unlikely(ret))
return ret;
#ifdef CONFIG_FS_DAX #ifdef CONFIG_FS_DAX
if (IS_DAX(inode)) if (IS_DAX(inode))
@ -700,7 +702,6 @@ ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
if (iocb->ki_flags & IOCB_ATOMIC) { if (iocb->ki_flags & IOCB_ATOMIC) {
size_t len = iov_iter_count(from); size_t len = iov_iter_count(from);
int ret;
if (len < EXT4_SB(inode->i_sb)->s_awu_min || if (len < EXT4_SB(inode->i_sb)->s_awu_min ||
len > EXT4_SB(inode->i_sb)->s_awu_max) len > EXT4_SB(inode->i_sb)->s_awu_max)
@ -803,11 +804,16 @@ static const struct vm_operations_struct ext4_file_vm_ops = {
static int ext4_file_mmap(struct file *file, struct vm_area_struct *vma) static int ext4_file_mmap(struct file *file, struct vm_area_struct *vma)
{ {
int ret;
struct inode *inode = file->f_mapping->host; struct inode *inode = file->f_mapping->host;
struct dax_device *dax_dev = EXT4_SB(inode->i_sb)->s_daxdev; struct dax_device *dax_dev = EXT4_SB(inode->i_sb)->s_daxdev;
if (unlikely(ext4_forced_shutdown(inode->i_sb))) if (file->f_mode & FMODE_WRITE)
return -EIO; ret = ext4_emergency_state(inode->i_sb);
else
ret = ext4_forced_shutdown(inode->i_sb) ? -EIO : 0;
if (unlikely(ret))
return ret;
/* /*
* We don't support synchronous mappings for non-DAX files and * We don't support synchronous mappings for non-DAX files and
@ -881,8 +887,12 @@ static int ext4_file_open(struct inode *inode, struct file *filp)
{ {
int ret; int ret;
if (unlikely(ext4_forced_shutdown(inode->i_sb))) if (filp->f_mode & FMODE_WRITE)
return -EIO; ret = ext4_emergency_state(inode->i_sb);
else
ret = ext4_forced_shutdown(inode->i_sb) ? -EIO : 0;
if (unlikely(ret))
return ret;
ret = ext4_sample_last_mounted(inode->i_sb, filp->f_path.mnt); ret = ext4_sample_last_mounted(inode->i_sb, filp->f_path.mnt);
if (ret) if (ret)

View File

@ -132,20 +132,16 @@ int ext4_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
bool needs_barrier = false; bool needs_barrier = false;
struct inode *inode = file->f_mapping->host; struct inode *inode = file->f_mapping->host;
if (unlikely(ext4_forced_shutdown(inode->i_sb))) ret = ext4_emergency_state(inode->i_sb);
return -EIO; if (unlikely(ret))
return ret;
ASSERT(ext4_journal_current_handle() == NULL); ASSERT(ext4_journal_current_handle() == NULL);
trace_ext4_sync_file_enter(file, datasync); trace_ext4_sync_file_enter(file, datasync);
if (sb_rdonly(inode->i_sb)) { if (sb_rdonly(inode->i_sb))
/* Make sure that we read updated s_ext4_flags value */
smp_rmb();
if (ext4_forced_shutdown(inode->i_sb))
ret = -EROFS;
goto out; goto out;
}
if (!EXT4_SB(inode->i_sb)->s_journal) { if (!EXT4_SB(inode->i_sb)->s_journal) {
ret = ext4_fsync_nojournal(file, start, end, datasync, ret = ext4_fsync_nojournal(file, start, end, datasync,

View File

@ -951,8 +951,9 @@ struct inode *__ext4_new_inode(struct mnt_idmap *idmap,
sb = dir->i_sb; sb = dir->i_sb;
sbi = EXT4_SB(sb); sbi = EXT4_SB(sb);
if (unlikely(ext4_forced_shutdown(sb))) ret2 = ext4_emergency_state(sb);
return ERR_PTR(-EIO); if (unlikely(ret2))
return ERR_PTR(ret2);
ngroups = ext4_get_groups_count(sb); ngroups = ext4_get_groups_count(sb);
trace_ext4_request_inode(dir, mode); trace_ext4_request_inode(dir, mode);

View File

@ -233,7 +233,7 @@ static void ext4_write_inline_data(struct inode *inode, struct ext4_iloc *iloc,
struct ext4_inode *raw_inode; struct ext4_inode *raw_inode;
int cp_len = 0; int cp_len = 0;
if (unlikely(ext4_forced_shutdown(inode->i_sb))) if (unlikely(ext4_emergency_state(inode->i_sb)))
return; return;
BUG_ON(!EXT4_I(inode)->i_inline_off); BUG_ON(!EXT4_I(inode)->i_inline_off);

View File

@ -1150,8 +1150,9 @@ static int ext4_write_begin(struct file *file, struct address_space *mapping,
pgoff_t index; pgoff_t index;
unsigned from, to; unsigned from, to;
if (unlikely(ext4_forced_shutdown(inode->i_sb))) ret = ext4_emergency_state(inode->i_sb);
return -EIO; if (unlikely(ret))
return ret;
trace_ext4_write_begin(inode, pos, len); trace_ext4_write_begin(inode, pos, len);
/* /*
@ -2274,7 +2275,7 @@ static int mpage_map_and_submit_extent(handle_t *handle,
if (err < 0) { if (err < 0) {
struct super_block *sb = inode->i_sb; struct super_block *sb = inode->i_sb;
if (ext4_forced_shutdown(sb)) if (ext4_emergency_state(sb))
goto invalidate_dirty_pages; goto invalidate_dirty_pages;
/* /*
* Let the uper layers retry transient errors. * Let the uper layers retry transient errors.
@ -2600,10 +2601,9 @@ static int ext4_do_writepages(struct mpage_da_data *mpd)
* *never* be called, so if that ever happens, we would want * *never* be called, so if that ever happens, we would want
* the stack trace. * the stack trace.
*/ */
if (unlikely(ext4_forced_shutdown(mapping->host->i_sb))) { ret = ext4_emergency_state(mapping->host->i_sb);
ret = -EROFS; if (unlikely(ret))
goto out_writepages; goto out_writepages;
}
/* /*
* If we have inline data and arrive here, it means that * If we have inline data and arrive here, it means that
@ -2818,8 +2818,9 @@ static int ext4_writepages(struct address_space *mapping,
int ret; int ret;
int alloc_ctx; int alloc_ctx;
if (unlikely(ext4_forced_shutdown(sb))) ret = ext4_emergency_state(sb);
return -EIO; if (unlikely(ret))
return ret;
alloc_ctx = ext4_writepages_down_read(sb); alloc_ctx = ext4_writepages_down_read(sb);
ret = ext4_do_writepages(&mpd); ret = ext4_do_writepages(&mpd);
@ -2859,8 +2860,9 @@ static int ext4_dax_writepages(struct address_space *mapping,
struct inode *inode = mapping->host; struct inode *inode = mapping->host;
int alloc_ctx; int alloc_ctx;
if (unlikely(ext4_forced_shutdown(inode->i_sb))) ret = ext4_emergency_state(inode->i_sb);
return -EIO; if (unlikely(ret))
return ret;
alloc_ctx = ext4_writepages_down_read(inode->i_sb); alloc_ctx = ext4_writepages_down_read(inode->i_sb);
trace_ext4_writepages(inode, wbc); trace_ext4_writepages(inode, wbc);
@ -2916,8 +2918,9 @@ static int ext4_da_write_begin(struct file *file, struct address_space *mapping,
pgoff_t index; pgoff_t index;
struct inode *inode = mapping->host; struct inode *inode = mapping->host;
if (unlikely(ext4_forced_shutdown(inode->i_sb))) ret = ext4_emergency_state(inode->i_sb);
return -EIO; if (unlikely(ret))
return ret;
index = pos >> PAGE_SHIFT; index = pos >> PAGE_SHIFT;
@ -5247,8 +5250,9 @@ int ext4_write_inode(struct inode *inode, struct writeback_control *wbc)
if (WARN_ON_ONCE(current->flags & PF_MEMALLOC)) if (WARN_ON_ONCE(current->flags & PF_MEMALLOC))
return 0; return 0;
if (unlikely(ext4_forced_shutdown(inode->i_sb))) err = ext4_emergency_state(inode->i_sb);
return -EIO; if (unlikely(err))
return err;
if (EXT4_SB(inode->i_sb)->s_journal) { if (EXT4_SB(inode->i_sb)->s_journal) {
if (ext4_journal_current_handle()) { if (ext4_journal_current_handle()) {
@ -5370,8 +5374,9 @@ int ext4_setattr(struct mnt_idmap *idmap, struct dentry *dentry,
const unsigned int ia_valid = attr->ia_valid; const unsigned int ia_valid = attr->ia_valid;
bool inc_ivers = true; bool inc_ivers = true;
if (unlikely(ext4_forced_shutdown(inode->i_sb))) error = ext4_emergency_state(inode->i_sb);
return -EIO; if (unlikely(error))
return error;
if (unlikely(IS_IMMUTABLE(inode))) if (unlikely(IS_IMMUTABLE(inode)))
return -EPERM; return -EPERM;
@ -5815,9 +5820,10 @@ int ext4_mark_iloc_dirty(handle_t *handle,
{ {
int err = 0; int err = 0;
if (unlikely(ext4_forced_shutdown(inode->i_sb))) { err = ext4_emergency_state(inode->i_sb);
if (unlikely(err)) {
put_bh(iloc->bh); put_bh(iloc->bh);
return -EIO; return err;
} }
ext4_fc_track_inode(handle, inode); ext4_fc_track_inode(handle, inode);
@ -5841,8 +5847,9 @@ ext4_reserve_inode_write(handle_t *handle, struct inode *inode,
{ {
int err; int err;
if (unlikely(ext4_forced_shutdown(inode->i_sb))) err = ext4_emergency_state(inode->i_sb);
return -EIO; if (unlikely(err))
return err;
err = ext4_get_inode_loc(inode, iloc); err = ext4_get_inode_loc(inode, iloc);
if (!err) { if (!err) {

View File

@ -5653,7 +5653,7 @@ static inline void ext4_mb_show_pa(struct super_block *sb)
{ {
ext4_group_t i, ngroups; ext4_group_t i, ngroups;
if (ext4_forced_shutdown(sb)) if (ext4_emergency_state(sb))
return; return;
ngroups = ext4_get_groups_count(sb); ngroups = ext4_get_groups_count(sb);
@ -5687,7 +5687,7 @@ static void ext4_mb_show_ac(struct ext4_allocation_context *ac)
{ {
struct super_block *sb = ac->ac_sb; struct super_block *sb = ac->ac_sb;
if (ext4_forced_shutdown(sb)) if (ext4_emergency_state(sb))
return; return;
mb_debug(sb, "Can't allocate:" mb_debug(sb, "Can't allocate:"

View File

@ -162,7 +162,7 @@ static int kmmpd(void *data)
memcpy(mmp->mmp_nodename, init_utsname()->nodename, memcpy(mmp->mmp_nodename, init_utsname()->nodename,
sizeof(mmp->mmp_nodename)); sizeof(mmp->mmp_nodename));
while (!kthread_should_stop() && !ext4_forced_shutdown(sb)) { while (!kthread_should_stop() && !ext4_emergency_state(sb)) {
if (!ext4_has_feature_mmp(sb)) { if (!ext4_has_feature_mmp(sb)) {
ext4_warning(sb, "kmmpd being stopped since MMP feature" ext4_warning(sb, "kmmpd being stopped since MMP feature"
" has been disabled."); " has been disabled.");

View File

@ -3157,8 +3157,9 @@ static int ext4_rmdir(struct inode *dir, struct dentry *dentry)
struct ext4_dir_entry_2 *de; struct ext4_dir_entry_2 *de;
handle_t *handle = NULL; handle_t *handle = NULL;
if (unlikely(ext4_forced_shutdown(dir->i_sb))) retval = ext4_emergency_state(dir->i_sb);
return -EIO; if (unlikely(retval))
return retval;
/* Initialize quotas before so that eventual writes go in /* Initialize quotas before so that eventual writes go in
* separate transaction */ * separate transaction */
@ -3315,8 +3316,9 @@ static int ext4_unlink(struct inode *dir, struct dentry *dentry)
{ {
int retval; int retval;
if (unlikely(ext4_forced_shutdown(dir->i_sb))) retval = ext4_emergency_state(dir->i_sb);
return -EIO; if (unlikely(retval))
return retval;
trace_ext4_unlink_enter(dir, dentry); trace_ext4_unlink_enter(dir, dentry);
/* /*
@ -3382,8 +3384,9 @@ static int ext4_symlink(struct mnt_idmap *idmap, struct inode *dir,
struct fscrypt_str disk_link; struct fscrypt_str disk_link;
int retries = 0; int retries = 0;
if (unlikely(ext4_forced_shutdown(dir->i_sb))) err = ext4_emergency_state(dir->i_sb);
return -EIO; if (unlikely(err))
return err;
err = fscrypt_prepare_symlink(dir, symname, len, dir->i_sb->s_blocksize, err = fscrypt_prepare_symlink(dir, symname, len, dir->i_sb->s_blocksize,
&disk_link); &disk_link);
@ -4205,8 +4208,9 @@ static int ext4_rename2(struct mnt_idmap *idmap,
{ {
int err; int err;
if (unlikely(ext4_forced_shutdown(old_dir->i_sb))) err = ext4_emergency_state(old_dir->i_sb);
return -EIO; if (unlikely(err))
return err;
if (flags & ~(RENAME_NOREPLACE | RENAME_EXCHANGE | RENAME_WHITEOUT)) if (flags & ~(RENAME_NOREPLACE | RENAME_EXCHANGE | RENAME_WHITEOUT))
return -EINVAL; return -EINVAL;

View File

@ -198,7 +198,7 @@ static int ext4_end_io_end(ext4_io_end_t *io_end)
} else { } else {
ret = ext4_convert_unwritten_io_end_vec(handle, io_end); ret = ext4_convert_unwritten_io_end_vec(handle, io_end);
} }
if (ret < 0 && !ext4_forced_shutdown(sb) && if (ret < 0 && !ext4_emergency_state(sb) &&
io_end->flag & EXT4_IO_END_UNWRITTEN) { io_end->flag & EXT4_IO_END_UNWRITTEN) {
ext4_msg(sb, KERN_EMERG, ext4_msg(sb, KERN_EMERG,
"failed to convert unwritten extents to written " "failed to convert unwritten extents to written "

View File

@ -804,7 +804,7 @@ void __ext4_error(struct super_block *sb, const char *function,
struct va_format vaf; struct va_format vaf;
va_list args; va_list args;
if (unlikely(ext4_forced_shutdown(sb))) if (unlikely(ext4_emergency_state(sb)))
return; return;
trace_ext4_error(sb, function, line); trace_ext4_error(sb, function, line);
@ -829,7 +829,7 @@ void __ext4_error_inode(struct inode *inode, const char *function,
va_list args; va_list args;
struct va_format vaf; struct va_format vaf;
if (unlikely(ext4_forced_shutdown(inode->i_sb))) if (unlikely(ext4_emergency_state(inode->i_sb)))
return; return;
trace_ext4_error(inode->i_sb, function, line); trace_ext4_error(inode->i_sb, function, line);
@ -864,7 +864,7 @@ void __ext4_error_file(struct file *file, const char *function,
struct inode *inode = file_inode(file); struct inode *inode = file_inode(file);
char pathname[80], *path; char pathname[80], *path;
if (unlikely(ext4_forced_shutdown(inode->i_sb))) if (unlikely(ext4_emergency_state(inode->i_sb)))
return; return;
trace_ext4_error(inode->i_sb, function, line); trace_ext4_error(inode->i_sb, function, line);
@ -944,7 +944,7 @@ void __ext4_std_error(struct super_block *sb, const char *function,
char nbuf[16]; char nbuf[16];
const char *errstr; const char *errstr;
if (unlikely(ext4_forced_shutdown(sb))) if (unlikely(ext4_emergency_state(sb)))
return; return;
/* Special case: if the error is EROFS, and we're not already /* Special case: if the error is EROFS, and we're not already
@ -1038,7 +1038,7 @@ __acquires(bitlock)
struct va_format vaf; struct va_format vaf;
va_list args; va_list args;
if (unlikely(ext4_forced_shutdown(sb))) if (unlikely(ext4_emergency_state(sb)))
return; return;
trace_ext4_error(sb, function, line); trace_ext4_error(sb, function, line);
@ -6328,8 +6328,9 @@ static int ext4_sync_fs(struct super_block *sb, int wait)
bool needs_barrier = false; bool needs_barrier = false;
struct ext4_sb_info *sbi = EXT4_SB(sb); struct ext4_sb_info *sbi = EXT4_SB(sb);
if (unlikely(ext4_forced_shutdown(sb))) ret = ext4_emergency_state(sb);
return -EIO; if (unlikely(ret))
return ret;
trace_ext4_sync_fs(sb, wait); trace_ext4_sync_fs(sb, wait);
flush_workqueue(sbi->rsv_conversion_wq); flush_workqueue(sbi->rsv_conversion_wq);
@ -6411,7 +6412,7 @@ static int ext4_freeze(struct super_block *sb)
*/ */
static int ext4_unfreeze(struct super_block *sb) static int ext4_unfreeze(struct super_block *sb)
{ {
if (ext4_forced_shutdown(sb)) if (ext4_emergency_state(sb))
return 0; return 0;
if (EXT4_SB(sb)->s_journal) { if (EXT4_SB(sb)->s_journal) {
@ -6567,7 +6568,7 @@ static int __ext4_remount(struct fs_context *fc, struct super_block *sb)
flush_work(&sbi->s_sb_upd_work); flush_work(&sbi->s_sb_upd_work);
if ((bool)(fc->sb_flags & SB_RDONLY) != sb_rdonly(sb)) { if ((bool)(fc->sb_flags & SB_RDONLY) != sb_rdonly(sb)) {
if (ext4_forced_shutdown(sb)) { if (ext4_emergency_state(sb)) {
err = -EROFS; err = -EROFS;
goto restore_opts; goto restore_opts;
} }