Commit 00e09c0b authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim

f2fs: enhance f2fs_is_checkpoint_ready()'s readability

This patch changes sematics of f2fs_is_checkpoint_ready()'s return
value as: return true when checkpoint is ready, other return false,
it can improve readability of below conditions.

f2fs_submit_page_write()
...
	if (is_sbi_flag_set(sbi, SBI_IS_SHUTDOWN) ||
				!f2fs_is_checkpoint_ready(sbi))
		__submit_merged_bio(io);

f2fs_balance_fs()
...
	if (!f2fs_is_checkpoint_ready(sbi))
		return;
Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent b757f6ed
...@@ -634,7 +634,7 @@ void f2fs_submit_page_write(struct f2fs_io_info *fio) ...@@ -634,7 +634,7 @@ void f2fs_submit_page_write(struct f2fs_io_info *fio)
goto next; goto next;
out: out:
if (is_sbi_flag_set(sbi, SBI_IS_SHUTDOWN) || if (is_sbi_flag_set(sbi, SBI_IS_SHUTDOWN) ||
f2fs_is_checkpoint_ready(sbi)) !f2fs_is_checkpoint_ready(sbi))
__submit_merged_bio(io); __submit_merged_bio(io);
up_write(&io->io_rwsem); up_write(&io->io_rwsem);
} }
...@@ -2570,9 +2570,10 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping, ...@@ -2570,9 +2570,10 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping,
trace_f2fs_write_begin(inode, pos, len, flags); trace_f2fs_write_begin(inode, pos, len, flags);
err = f2fs_is_checkpoint_ready(sbi); if (!f2fs_is_checkpoint_ready(sbi)) {
if (err) err = -ENOSPC;
goto fail; goto fail;
}
if ((f2fs_is_atomic_file(inode) && if ((f2fs_is_atomic_file(inode) &&
!f2fs_available_free_memory(sbi, INMEM_PAGES)) || !f2fs_available_free_memory(sbi, INMEM_PAGES)) ||
......
...@@ -57,9 +57,11 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf) ...@@ -57,9 +57,11 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf)
err = -EIO; err = -EIO;
goto err; goto err;
} }
err = f2fs_is_checkpoint_ready(sbi);
if (err) if (!f2fs_is_checkpoint_ready(sbi)) {
err = -ENOSPC;
goto err; goto err;
}
sb_start_pagefault(inode->i_sb); sb_start_pagefault(inode->i_sb);
...@@ -1571,9 +1573,8 @@ static long f2fs_fallocate(struct file *file, int mode, ...@@ -1571,9 +1573,8 @@ static long f2fs_fallocate(struct file *file, int mode,
if (unlikely(f2fs_cp_error(F2FS_I_SB(inode)))) if (unlikely(f2fs_cp_error(F2FS_I_SB(inode))))
return -EIO; return -EIO;
ret = f2fs_is_checkpoint_ready(F2FS_I_SB(inode)); if (!f2fs_is_checkpoint_ready(F2FS_I_SB(inode)))
if (ret) return -ENOSPC;
return ret;
/* f2fs only support ->fallocate for regular file */ /* f2fs only support ->fallocate for regular file */
if (!S_ISREG(inode->i_mode)) if (!S_ISREG(inode->i_mode))
...@@ -3146,13 +3147,10 @@ static int f2fs_set_volume_name(struct file *filp, unsigned long arg) ...@@ -3146,13 +3147,10 @@ static int f2fs_set_volume_name(struct file *filp, unsigned long arg)
long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) long f2fs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
{ {
int ret;
if (unlikely(f2fs_cp_error(F2FS_I_SB(file_inode(filp))))) if (unlikely(f2fs_cp_error(F2FS_I_SB(file_inode(filp)))))
return -EIO; return -EIO;
ret = f2fs_is_checkpoint_ready(F2FS_I_SB(file_inode(filp))); if (!f2fs_is_checkpoint_ready(F2FS_I_SB(file_inode(filp))))
if (ret) return -ENOSPC;
return ret;
switch (cmd) { switch (cmd) {
case F2FS_IOC_GETFLAGS: case F2FS_IOC_GETFLAGS:
......
...@@ -616,7 +616,7 @@ int f2fs_write_inode(struct inode *inode, struct writeback_control *wbc) ...@@ -616,7 +616,7 @@ int f2fs_write_inode(struct inode *inode, struct writeback_control *wbc)
if (!is_inode_flag_set(inode, FI_DIRTY_INODE)) if (!is_inode_flag_set(inode, FI_DIRTY_INODE))
return 0; return 0;
if (f2fs_is_checkpoint_ready(sbi)) if (!f2fs_is_checkpoint_ready(sbi))
return -ENOSPC; return -ENOSPC;
/* /*
......
...@@ -272,9 +272,8 @@ static int f2fs_create(struct inode *dir, struct dentry *dentry, umode_t mode, ...@@ -272,9 +272,8 @@ static int f2fs_create(struct inode *dir, struct dentry *dentry, umode_t mode,
if (unlikely(f2fs_cp_error(sbi))) if (unlikely(f2fs_cp_error(sbi)))
return -EIO; return -EIO;
err = f2fs_is_checkpoint_ready(sbi); if (!f2fs_is_checkpoint_ready(sbi))
if (err) return -ENOSPC;
return err;
err = dquot_initialize(dir); err = dquot_initialize(dir);
if (err) if (err)
...@@ -321,9 +320,8 @@ static int f2fs_link(struct dentry *old_dentry, struct inode *dir, ...@@ -321,9 +320,8 @@ static int f2fs_link(struct dentry *old_dentry, struct inode *dir,
if (unlikely(f2fs_cp_error(sbi))) if (unlikely(f2fs_cp_error(sbi)))
return -EIO; return -EIO;
err = f2fs_is_checkpoint_ready(sbi); if (!f2fs_is_checkpoint_ready(sbi))
if (err) return -ENOSPC;
return err;
err = fscrypt_prepare_link(old_dentry, dir, dentry); err = fscrypt_prepare_link(old_dentry, dir, dentry);
if (err) if (err)
...@@ -592,9 +590,8 @@ static int f2fs_symlink(struct inode *dir, struct dentry *dentry, ...@@ -592,9 +590,8 @@ static int f2fs_symlink(struct inode *dir, struct dentry *dentry,
if (unlikely(f2fs_cp_error(sbi))) if (unlikely(f2fs_cp_error(sbi)))
return -EIO; return -EIO;
err = f2fs_is_checkpoint_ready(sbi); if (!f2fs_is_checkpoint_ready(sbi))
if (err) return -ENOSPC;
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);
...@@ -724,9 +721,8 @@ static int f2fs_mknod(struct inode *dir, struct dentry *dentry, ...@@ -724,9 +721,8 @@ static int f2fs_mknod(struct inode *dir, struct dentry *dentry,
if (unlikely(f2fs_cp_error(sbi))) if (unlikely(f2fs_cp_error(sbi)))
return -EIO; return -EIO;
err = f2fs_is_checkpoint_ready(sbi); if (!f2fs_is_checkpoint_ready(sbi))
if (err) return -ENOSPC;
return err;
err = dquot_initialize(dir); err = dquot_initialize(dir);
if (err) if (err)
...@@ -822,13 +818,11 @@ static int __f2fs_tmpfile(struct inode *dir, struct dentry *dentry, ...@@ -822,13 +818,11 @@ static int __f2fs_tmpfile(struct inode *dir, struct dentry *dentry,
static int f2fs_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode) static int f2fs_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode)
{ {
struct f2fs_sb_info *sbi = F2FS_I_SB(dir); struct f2fs_sb_info *sbi = F2FS_I_SB(dir);
int ret;
if (unlikely(f2fs_cp_error(sbi))) if (unlikely(f2fs_cp_error(sbi)))
return -EIO; return -EIO;
ret = f2fs_is_checkpoint_ready(sbi); if (!f2fs_is_checkpoint_ready(sbi))
if (ret) return -ENOSPC;
return ret;
if (IS_ENCRYPTED(dir) || DUMMY_ENCRYPTION_ENABLED(sbi)) { if (IS_ENCRYPTED(dir) || DUMMY_ENCRYPTION_ENABLED(sbi)) {
int err = fscrypt_get_encryption_info(dir); int err = fscrypt_get_encryption_info(dir);
...@@ -865,9 +859,8 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry, ...@@ -865,9 +859,8 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry,
if (unlikely(f2fs_cp_error(sbi))) if (unlikely(f2fs_cp_error(sbi)))
return -EIO; return -EIO;
err = f2fs_is_checkpoint_ready(sbi); if (!f2fs_is_checkpoint_ready(sbi))
if (err) return -ENOSPC;
return err;
if (is_inode_flag_set(new_dir, FI_PROJ_INHERIT) && if (is_inode_flag_set(new_dir, FI_PROJ_INHERIT) &&
(!projid_eq(F2FS_I(new_dir)->i_projid, (!projid_eq(F2FS_I(new_dir)->i_projid,
...@@ -1060,9 +1053,8 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry, ...@@ -1060,9 +1053,8 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry,
if (unlikely(f2fs_cp_error(sbi))) if (unlikely(f2fs_cp_error(sbi)))
return -EIO; return -EIO;
err = f2fs_is_checkpoint_ready(sbi); if (!f2fs_is_checkpoint_ready(sbi))
if (err) return -ENOSPC;
return err;
if ((is_inode_flag_set(new_dir, FI_PROJ_INHERIT) && if ((is_inode_flag_set(new_dir, FI_PROJ_INHERIT) &&
!projid_eq(F2FS_I(new_dir)->i_projid, !projid_eq(F2FS_I(new_dir)->i_projid,
......
...@@ -501,7 +501,7 @@ void f2fs_balance_fs(struct f2fs_sb_info *sbi, bool need) ...@@ -501,7 +501,7 @@ void f2fs_balance_fs(struct f2fs_sb_info *sbi, bool need)
if (need && excess_cached_nats(sbi)) if (need && excess_cached_nats(sbi))
f2fs_balance_fs_bg(sbi); f2fs_balance_fs_bg(sbi);
if (f2fs_is_checkpoint_ready(sbi)) if (!f2fs_is_checkpoint_ready(sbi))
return; return;
/* /*
......
...@@ -586,13 +586,13 @@ static inline bool has_not_enough_free_secs(struct f2fs_sb_info *sbi, ...@@ -586,13 +586,13 @@ static inline bool has_not_enough_free_secs(struct f2fs_sb_info *sbi,
reserved_sections(sbi) + needed); reserved_sections(sbi) + needed);
} }
static inline int f2fs_is_checkpoint_ready(struct f2fs_sb_info *sbi) static inline bool f2fs_is_checkpoint_ready(struct f2fs_sb_info *sbi)
{ {
if (likely(!is_sbi_flag_set(sbi, SBI_CP_DISABLED))) if (likely(!is_sbi_flag_set(sbi, SBI_CP_DISABLED)))
return 0; return true;
if (likely(!has_not_enough_free_secs(sbi, 0, 0))) if (likely(!has_not_enough_free_secs(sbi, 0, 0)))
return 0; return true;
return -ENOSPC; return false;
} }
static inline bool excess_prefree_segs(struct f2fs_sb_info *sbi) static inline bool excess_prefree_segs(struct f2fs_sb_info *sbi)
......
...@@ -732,9 +732,8 @@ int f2fs_setxattr(struct inode *inode, int index, const char *name, ...@@ -732,9 +732,8 @@ int f2fs_setxattr(struct inode *inode, int index, const char *name,
if (unlikely(f2fs_cp_error(sbi))) if (unlikely(f2fs_cp_error(sbi)))
return -EIO; return -EIO;
err = f2fs_is_checkpoint_ready(sbi); if (!f2fs_is_checkpoint_ready(sbi))
if (err) return -ENOSPC;
return err;
err = dquot_initialize(inode); err = dquot_initialize(inode);
if (err) if (err)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment