[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20190722095706.116545-1-yuchao0@huawei.com>
Date: Mon, 22 Jul 2019 17:57:05 +0800
From: Chao Yu <yuchao0@...wei.com>
To: <jaegeuk@...nel.org>
CC: <drosen@...gle.com>, Chao Yu <yuchao0@...wei.com>,
<linux-f2fs-devel@...ts.sourceforge.net>,
<linux-kernel@...r.kernel.org>, <chao@...nel.org>
Subject: [PATCH 1/2] f2fs: fix to spread f2fs_is_checkpoint_ready()
We missed to call f2fs_is_checkpoint_ready() in several places, it may
allow space allocation even when free space was exhausted during
checkpoint is disabled, fix to add them.
Signed-off-by: Chao Yu <yuchao0@...wei.com>
---
fs/f2fs/file.c | 11 +++++++++++
fs/f2fs/namei.c | 4 ++++
fs/f2fs/xattr.c | 5 +++++
3 files changed, 20 insertions(+)
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index ae0fec54cac6..43d878f3db0f 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -57,6 +57,9 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf)
err = -EIO;
goto err;
}
+ err = f2fs_is_checkpoint_ready(sbi);
+ if (err)
+ goto err;
sb_start_pagefault(inode->i_sb);
@@ -1568,6 +1571,9 @@ static long f2fs_fallocate(struct file *file, int mode,
if (unlikely(f2fs_cp_error(F2FS_I_SB(inode))))
return -EIO;
+ ret = f2fs_is_checkpoint_ready(F2FS_I_SB(inode));
+ if (ret)
+ return ret;
/* f2fs only support ->fallocate for regular file */
if (!S_ISREG(inode->i_mode))
@@ -3150,8 +3156,13 @@ static int f2fs_set_volume_name(struct file *filp, 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)))))
return -EIO;
+ ret = f2fs_is_checkpoint_ready(F2FS_I_SB(file_inode(filp)));
+ if (ret)
+ return ret;
switch (cmd) {
case F2FS_IOC_GETFLAGS:
diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c
index c5b99042e6f2..09fb4f31576e 100644
--- a/fs/f2fs/namei.c
+++ b/fs/f2fs/namei.c
@@ -801,9 +801,13 @@ static int __f2fs_tmpfile(struct inode *dir, struct dentry *dentry,
static int f2fs_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode)
{
struct f2fs_sb_info *sbi = F2FS_I_SB(dir);
+ int ret;
if (unlikely(f2fs_cp_error(sbi)))
return -EIO;
+ ret = f2fs_is_checkpoint_ready(sbi);
+ if (ret)
+ return ret;
if (IS_ENCRYPTED(dir) || DUMMY_ENCRYPTION_ENABLED(sbi)) {
int err = fscrypt_get_encryption_info(dir);
diff --git a/fs/f2fs/xattr.c b/fs/f2fs/xattr.c
index b32c45621679..3c92f4122044 100644
--- a/fs/f2fs/xattr.c
+++ b/fs/f2fs/xattr.c
@@ -21,6 +21,7 @@
#include <linux/posix_acl_xattr.h>
#include "f2fs.h"
#include "xattr.h"
+#include "segment.h"
static int f2fs_xattr_generic_get(const struct xattr_handler *handler,
struct dentry *unused, struct inode *inode,
@@ -729,6 +730,10 @@ int f2fs_setxattr(struct inode *inode, int index, const char *name,
struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
int err;
+ err = f2fs_is_checkpoint_ready(sbi);
+ if (err)
+ return err;
+
err = dquot_initialize(inode);
if (err)
return err;
--
2.18.0.rc1
Powered by blists - more mailing lists