f2fs: add missing quota_initialize in f2fs_set_acl
Subsystems (2)
Jaegeuk Kim
maintainerPATCH 1/2 f2fs: add missing quota_initialize in f2fs_set_acl
This patch adds to call quota_intialize in f2fs_set_acl.
--- fs/f2fs/acl.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/f2fs/acl.c +4 -0
@@ -209,6 +209,10 @@ static int __f2fs_set_acl(struct inode *inode, int type,int error;umode_t mode = inode->i_mode; + error =dquot_initialize (inode); +if (error) +return error; +switch (type) {case ACL_TYPE_ACCESS : name_index =F2FS_XATTR_INDEX_POSIX_ACL_ACCESS ;
Signature · 1 line
2.14.0.rc1.383.gd1ce394fe2-goog
Jaegeuk Kim
maintainerPATCH 2/2 f2fs: stop all the operations by cp_error flag
This patch replaces to use cp_error flag instead of RDONLY for quota off.
--- fs/f2fs/acl.c | 3 +++ fs/f2fs/checkpoint.c | 1 - fs/f2fs/file.c | 23 +++++++++++++++++++++++ fs/f2fs/namei.c | 30 ++++++++++++++++++++++++++++++ fs/f2fs/super.c | 3 +++ 5 files changed, 59 insertions(+), 1 deletion(-)
fs/f2fs/acl.c +3 -0
@@ -254,6 +254,9 @@ static int __f2fs_set_acl(struct inode *inode, int type,int f2fs_set_acl (struct inode *inode,struct posix_acl *acl,int type) { +if (unlikely (f2fs_cp_error (F2FS_I_SB (inode)))) +return -EIO ; +return __f2fs_set_acl (inode, type, acl,NULL ); }
fs/f2fs/checkpoint.c +0 -1
@@ -29,7 +29,6 @@ struct kmem_cache *inode_entry_slab;void f2fs_stop_checkpoint (struct f2fs_sb_info *sbi,bool end_io) {set_ckpt_flags (sbi,CP_ERROR_FLAG ); - sbi->sb->s_flags |=MS_RDONLY ;if (!end_io)f2fs_flush_merged_writes (sbi); }
fs/f2fs/file.c +23 -0
@@ -53,6 +53,9 @@ static int f2fs_vm_page_mkwrite(struct vm_fault *vmf)struct dnode_of_data dn;int err; +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; +sb_start_pagefault (inode->i_sb);f2fs_bug_on (sbi,f2fs_has_inline_data (inode));
@@ -310,6 +313,8 @@ static int f2fs_do_sync_file(struct file *file, loff_t start, loff_t end,int f2fs_sync_file (struct file *file,loff_t start,loff_t end,int datasync) { +if (unlikely (f2fs_cp_error (F2FS_I_SB (file_inode (file))))) +return -EIO ;return f2fs_do_sync_file (file, start, end, datasync, false); }
@@ -446,6 +451,9 @@ static int f2fs_file_mmap(struct file *file, struct vm_area_struct *vma)struct inode *inode =file_inode (file);int err; +if (unlikely (f2fs_cp_error (F2FS_I_SB (inode)))) +return -EIO ; +/* we don't need to use inline_data strictly */ err =f2fs_convert_inline_inode (inode);if (err)
@@ -632,6 +640,9 @@ int f2fs_truncate(struct inode *inode) {int err; +if (unlikely (f2fs_cp_error (F2FS_I_SB (inode)))) +return -EIO ; +if (!(S_ISREG (inode->i_mode) ||S_ISDIR (inode->i_mode) ||S_ISLNK (inode->i_mode)))return 0 ;
@@ -731,6 +742,9 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr)int err;bool size_changed = false; +if (unlikely (f2fs_cp_error (F2FS_I_SB (inode)))) +return -EIO ; + err =setattr_prepare (dentry, attr);if (err)return err;
@@ -1459,6 +1473,9 @@ static long f2fs_fallocate(struct file *file, int mode,struct inode *inode =file_inode (file);long ret =0 ; +if (unlikely (f2fs_cp_error (F2FS_I_SB (inode)))) +return -EIO ; +/* f2fs only support ->fallocate for regular file */ if (!S_ISREG (inode->i_mode))return -EINVAL ;
@@ -2637,6 +2654,9 @@ static int f2fs_ioc_fssetxattr(struct file *filp, unsigned long arg)long f2fs_ioctl (struct file *filp,unsigned int cmd,unsigned long arg) { +if (unlikely (f2fs_cp_error (F2FS_I_SB (file_inode (filp))))) +return -EIO ; +switch (cmd) {case F2FS_IOC_GETFLAGS :return f2fs_ioc_getflags (filp, arg);
@@ -2694,6 +2714,9 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)struct blk_plug plug;ssize_t ret; +if (unlikely (f2fs_cp_error (F2FS_I_SB (inode)))) +return -EIO ; +inode_lock (inode); ret =generic_write_checks (iocb, from);if (ret >0 ) {
fs/f2fs/namei.c +30 -0
@@ -183,6 +183,9 @@ static int f2fs_create(struct inode *dir, struct dentry *dentry, umode_t mode,nid_t ino =0 ;int err; +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; + err =dquot_initialize (dir);if (err)return err;
@@ -227,6 +230,9 @@ static int f2fs_link(struct dentry *old_dentry, struct inode *dir,struct f2fs_sb_info *sbi =F2FS_I_SB (dir);int err; +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; +if (f2fs_encrypted_inode (dir) && !fscrypt_has_permitted_context (dir, inode))return -EPERM ;
@@ -426,6 +432,9 @@ static int f2fs_unlink(struct inode *dir, struct dentry *dentry)trace_f2fs_unlink_enter (dir, dentry); +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; + err =dquot_initialize (dir);if (err)return err;
@@ -481,6 +490,9 @@ static int f2fs_symlink(struct inode *dir, struct dentry *dentry,struct fscrypt_symlink_data *sd =NULL ;int err; +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; +if (f2fs_encrypted_inode (dir)) { err =fscrypt_get_encryption_info (dir);if (err)
@@ -587,6 +599,9 @@ static int f2fs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)struct inode *inode;int err; +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; + err =dquot_initialize (dir);if (err)return err;
@@ -639,6 +654,9 @@ static int f2fs_mknod(struct inode *dir, struct dentry *dentry,struct inode *inode;int err =0 ; +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; + err =dquot_initialize (dir);if (err)return err;
@@ -733,6 +751,9 @@ static int __f2fs_tmpfile(struct inode *dir, struct dentry *dentry,static int f2fs_tmpfile (struct inode *dir,struct dentry *dentry,umode_t mode) { +if (unlikely (f2fs_cp_error (F2FS_I_SB (dir)))) +return -EIO ; +if (f2fs_encrypted_inode (dir)) {int err =fscrypt_get_encryption_info (dir);if (err)
@@ -744,6 +765,9 @@ static int f2fs_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode)static int f2fs_create_whiteout (struct inode *dir,struct inode **whiteout) { +if (unlikely (f2fs_cp_error (F2FS_I_SB (dir)))) +return -EIO ; +return __f2fs_tmpfile (dir,NULL ,S_IFCHR |WHITEOUT_MODE , whiteout); }
@@ -763,6 +787,9 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry,bool is_old_inline =f2fs_has_inline_dentry (old_dir);int err = -ENOENT ; +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; + if ((f2fs_encrypted_inode(old_dir) && !fscrypt_has_encryption_key(old_dir)) || (f2fs_encrypted_inode(new_dir) &&
@@ -956,6 +983,9 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry,int old_nlink =0 , new_nlink =0 ;int err = -ENOENT ; +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; + if ((f2fs_encrypted_inode(old_dir) && !fscrypt_has_encryption_key(old_dir)) || (f2fs_encrypted_inode(new_dir) &&
fs/f2fs/super.c +3 -0
@@ -885,6 +885,9 @@ int f2fs_sync_fs(struct super_block *sb, int sync)struct f2fs_sb_info *sbi =F2FS_SB (sb);int err =0 ; +if (unlikely (f2fs_cp_error (sbi))) +return 0 ; +trace_f2fs_sync_fs (sb, sync);if (unlikely (is_sbi_flag_set (sbi,SBI_POR_DOING )))
Signature · 1 line
2.14.0.rc1.383.gd1ce394fe2-goog
Re: [f2fs-dev] [PATCH 2/2] f2fs: stop all the operations by cp_error flag
Quoted 3 lines · Jaegeuk Kim
This patch replaces to use
cp_errorflag instead of RDONLY for quota off.Signed-off-by Jaegeuk Kim <[email protected]>
Thanks,
Quoted 236 lines
--- fs/f2fs/acl.c | 3 +++ fs/f2fs/checkpoint.c | 1 - fs/f2fs/file.c | 23 +++++++++++++++++++++++ fs/f2fs/namei.c | 30 ++++++++++++++++++++++++++++++ fs/f2fs/super.c | 3 +++ 5 files changed, 59 insertions(+), 1 deletion(-)fs/f2fs/acl.c +3
-0@@ -254,6 +254,9 @@ static int __f2fs_set_acl(struct inode *inode, int type,int f2fs_set_acl (struct inode *inode,struct posix_acl *acl,int type) { +if (unlikely (f2fs_cp_error (F2FS_I_SB (inode)))) +return -EIO ; +return __f2fs_set_acl (inode, type, acl,NULL ); }fs/f2fs/checkpoint.c +0
-1@@ -29,7 +29,6 @@ struct kmem_cache *inode_entry_slab;void f2fs_stop_checkpoint (struct f2fs_sb_info *sbi,bool end_io) {set_ckpt_flags (sbi,CP_ERROR_FLAG ); - sbi->sb->s_flags |=MS_RDONLY ;if (!end_io)f2fs_flush_merged_writes (sbi); }fs/f2fs/file.c +23
-0@@ -53,6 +53,9 @@ static int f2fs_vm_page_mkwrite(struct vm_fault *vmf)struct dnode_of_data dn;int err; +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; +sb_start_pagefault (inode->i_sb);f2fs_bug_on (sbi,f2fs_has_inline_data (inode));@@ -310,6 +313,8 @@ static int f2fs_do_sync_file(struct file *file, loff_t start, loff_t end,int f2fs_sync_file (struct file *file,loff_t start,loff_t end,int datasync) { +if (unlikely (f2fs_cp_error (F2FS_I_SB (file_inode (file))))) +return -EIO ;return f2fs_do_sync_file (file, start, end, datasync, false); }@@ -446,6 +451,9 @@ static int f2fs_file_mmap(struct file *file, struct vm_area_struct *vma)struct inode *inode =file_inode (file);int err; +if (unlikely (f2fs_cp_error (F2FS_I_SB (inode)))) +return -EIO ; +/* we don't need to use inline_data strictly */ err =f2fs_convert_inline_inode (inode);if (err)@@ -632,6 +640,9 @@ int f2fs_truncate(struct inode *inode) {int err; +if (unlikely (f2fs_cp_error (F2FS_I_SB (inode)))) +return -EIO ; +if (!(S_ISREG (inode->i_mode) ||S_ISDIR (inode->i_mode) ||S_ISLNK (inode->i_mode)))return 0 ;@@ -731,6 +742,9 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr)int err;bool size_changed = false; +if (unlikely (f2fs_cp_error (F2FS_I_SB (inode)))) +return -EIO ; + err =setattr_prepare (dentry, attr);if (err)return err;@@ -1459,6 +1473,9 @@ static long f2fs_fallocate(struct file *file, int mode,struct inode *inode =file_inode (file);long ret =0 ; +if (unlikely (f2fs_cp_error (F2FS_I_SB (inode)))) +return -EIO ; +/* f2fs only support ->fallocate for regular file */ if (!S_ISREG (inode->i_mode))return -EINVAL ;@@ -2637,6 +2654,9 @@ static int f2fs_ioc_fssetxattr(struct file *filp, unsigned long arg)long f2fs_ioctl (struct file *filp,unsigned int cmd,unsigned long arg) { +if (unlikely (f2fs_cp_error (F2FS_I_SB (file_inode (filp))))) +return -EIO ; +switch (cmd) {case F2FS_IOC_GETFLAGS :return f2fs_ioc_getflags (filp, arg);@@ -2694,6 +2714,9 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)struct blk_plug plug;ssize_t ret; +if (unlikely (f2fs_cp_error (F2FS_I_SB (inode)))) +return -EIO ; +inode_lock (inode); ret =generic_write_checks (iocb, from);if (ret >0 ) {fs/f2fs/namei.c +30
-0@@ -183,6 +183,9 @@ static int f2fs_create(struct inode *dir, struct dentry *dentry, umode_t mode,nid_t ino =0 ;int err; +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; + err =dquot_initialize (dir);if (err)return err;@@ -227,6 +230,9 @@ static int f2fs_link(struct dentry *old_dentry, struct inode *dir,struct f2fs_sb_info *sbi =F2FS_I_SB (dir);int err; +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; +if (f2fs_encrypted_inode (dir) && !fscrypt_has_permitted_context (dir, inode))return -EPERM ;@@ -426,6 +432,9 @@ static int f2fs_unlink(struct inode *dir, struct dentry *dentry)trace_f2fs_unlink_enter (dir, dentry); +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; + err =dquot_initialize (dir);if (err)return err;@@ -481,6 +490,9 @@ static int f2fs_symlink(struct inode *dir, struct dentry *dentry,struct fscrypt_symlink_data *sd =NULL ;int err; +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; +if (f2fs_encrypted_inode (dir)) { err =fscrypt_get_encryption_info (dir);if (err)@@ -587,6 +599,9 @@ static int f2fs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)struct inode *inode;int err; +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; + err =dquot_initialize (dir);if (err)return err;@@ -639,6 +654,9 @@ static int f2fs_mknod(struct inode *dir, struct dentry *dentry,struct inode *inode;int err =0 ; +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; + err =dquot_initialize (dir);if (err)return err;@@ -733,6 +751,9 @@ static int __f2fs_tmpfile(struct inode *dir, struct dentry *dentry,static int f2fs_tmpfile (struct inode *dir,struct dentry *dentry,umode_t mode) { +if (unlikely (f2fs_cp_error (F2FS_I_SB (dir)))) +return -EIO ; +if (f2fs_encrypted_inode (dir)) {int err =fscrypt_get_encryption_info (dir);if (err)@@ -744,6 +765,9 @@ static int f2fs_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode)static int f2fs_create_whiteout (struct inode *dir,struct inode **whiteout) { +if (unlikely (f2fs_cp_error (F2FS_I_SB (dir)))) +return -EIO ; +return __f2fs_tmpfile (dir,NULL ,S_IFCHR |WHITEOUT_MODE , whiteout); }@@ -763,6 +787,9 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry,bool is_old_inline =f2fs_has_inline_dentry (old_dir);int err = -ENOENT ; +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; + if ((f2fs_encrypted_inode(old_dir) && !fscrypt_has_encryption_key(old_dir)) || (f2fs_encrypted_inode(new_dir) &&@@ -956,6 +983,9 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry,int old_nlink =0 , new_nlink =0 ;int err = -ENOENT ; +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; + if ((f2fs_encrypted_inode(old_dir) && !fscrypt_has_encryption_key(old_dir)) || (f2fs_encrypted_inode(new_dir) &&fs/f2fs/super.c +3
-0@@ -885,6 +885,9 @@ int f2fs_sync_fs(struct super_block *sb, int sync)struct f2fs_sb_info *sbi =F2FS_SB (sb);int err =0 ; +if (unlikely (f2fs_cp_error (sbi))) +return 0 ; +trace_f2fs_sync_fs (sb, sync);if (unlikely (is_sbi_flag_set (sbi,SBI_POR_DOING )))
Chao Yu
maintainerRe: [f2fs-dev] [PATCH 2/2] f2fs: stop all the operations by cp_error flag
Hi Jaegeuk,
Quoted 2 lines · Chao Yu
Quoted 1 line · Jaegeuk Kim
This patch replaces to use
cp_errorflag instead of RDONLY for quota off.
We should convert error number with block_page_mkwrite_return in .page_mkwrite, otherwise generic/019 will cause a deadlock issue with below kernel message printed:
============================================
WARNING: possible recursive locking detected
4.14.0-rc1 #35 Tainted: G W O
--------------------------------------------
fio/5845 is trying to acquire lock:
(&mm->mmap_sem){++++}, at: [<c104be02>] __do_page_fault+0x482/0x510
but task is already holding lock:
(&mm->mmap_sem){++++}, at: [<c104ba9e>] __do_page_fault+0x11e/0x510
other info that might help us debug this:
Possible unsafe locking scenario:
CPU0
---- lock(&mm->mmap_sem);
lock(&mm->mmap_sem);
*** DEADLOCK ***
May be due to missing lock nesting notation
1 lock held by fio/5845:
#0: (&mm->mmap_sem){++++}, at: [<c104ba9e>] __do_page_fault+0x11e/0x510
stack backtrace: CPU: 3 PID: 5845 Comm: fio Tainted: G W O 4.14.0-rc1 #35 Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS VirtualBox 12/01/2006 Call Trace: dump_stack+0x5f/0x92 __lock_acquire+0x1019/0x12c0 lock_acquire+0xae/0x220 down_read+0x38/0x60 __do_page_fault+0x482/0x510 do_page_fault+0x26/0x290 common_exception+0x64/0x6a
--- fs/f2fs/file.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
fs/f2fs/file.c +7 -4
@@ -53,8 +53,10 @@ static int f2fs_vm_page_mkwrite(struct vm_fault *vmf)struct dnode_of_data dn;int err; -if (unlikely (f2fs_cp_error (sbi))) -return -EIO ; +if (unlikely (f2fs_cp_error (sbi))) { + err = -EIO ; + goto out; + }sb_start_pagefault (inode->i_sb);
@@ -66,7 +68,7 @@ static int f2fs_vm_page_mkwrite(struct vm_fault *vmf) err =f2fs_reserve_block (&dn, page->index);if (err) {f2fs_unlock_op (sbi); - goto out; + goto out_end; }f2fs_put_dnode (&dn);f2fs_unlock_op (sbi);
@@ -114,9 +116,10 @@ static int f2fs_vm_page_mkwrite(struct vm_fault *vmf) out_sem:up_read (&F2FS_I (inode)->i_mmap_sem); -out: +out_end:sb_end_pagefault (inode->i_sb);f2fs_update_time (sbi,REQ_TIME ); +out:return block_page_mkwrite_return (err); }
Signature · 1 line
Thanks,
Quoted 253 lines
Quoted 2 lines
Signed-off-by Jaegeuk Kim <[email protected]>Reviewed-by Chao Yu <[email protected]>Thanks,
Quoted 227 lines
--- fs/f2fs/acl.c | 3 +++ fs/f2fs/checkpoint.c | 1 - fs/f2fs/file.c | 23 +++++++++++++++++++++++ fs/f2fs/namei.c | 30 ++++++++++++++++++++++++++++++ fs/f2fs/super.c | 3 +++ 5 files changed, 59 insertions(+), 1 deletion(-)fs/f2fs/acl.c +3
-0@@ -254,6 +254,9 @@ static int __f2fs_set_acl(struct inode *inode, int type,int f2fs_set_acl (struct inode *inode,struct posix_acl *acl,int type) { +if (unlikely (f2fs_cp_error (F2FS_I_SB (inode)))) +return -EIO ; +return __f2fs_set_acl (inode, type, acl,NULL ); }fs/f2fs/checkpoint.c +0
-1@@ -29,7 +29,6 @@ struct kmem_cache *inode_entry_slab;void f2fs_stop_checkpoint (struct f2fs_sb_info *sbi,bool end_io) {set_ckpt_flags (sbi,CP_ERROR_FLAG ); - sbi->sb->s_flags |=MS_RDONLY ;if (!end_io)f2fs_flush_merged_writes (sbi); }fs/f2fs/file.c +23
-0@@ -53,6 +53,9 @@ static int f2fs_vm_page_mkwrite(struct vm_fault *vmf)struct dnode_of_data dn;int err; +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; +sb_start_pagefault (inode->i_sb);f2fs_bug_on (sbi,f2fs_has_inline_data (inode));@@ -310,6 +313,8 @@ static int f2fs_do_sync_file(struct file *file, loff_t start, loff_t end,int f2fs_sync_file (struct file *file,loff_t start,loff_t end,int datasync) { +if (unlikely (f2fs_cp_error (F2FS_I_SB (file_inode (file))))) +return -EIO ;return f2fs_do_sync_file (file, start, end, datasync, false); }@@ -446,6 +451,9 @@ static int f2fs_file_mmap(struct file *file, struct vm_area_struct *vma)struct inode *inode =file_inode (file);int err; +if (unlikely (f2fs_cp_error (F2FS_I_SB (inode)))) +return -EIO ; +/* we don't need to use inline_data strictly */ err =f2fs_convert_inline_inode (inode);if (err)@@ -632,6 +640,9 @@ int f2fs_truncate(struct inode *inode) {int err; +if (unlikely (f2fs_cp_error (F2FS_I_SB (inode)))) +return -EIO ; +if (!(S_ISREG (inode->i_mode) ||S_ISDIR (inode->i_mode) ||S_ISLNK (inode->i_mode)))return 0 ;@@ -731,6 +742,9 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr)int err;bool size_changed = false; +if (unlikely (f2fs_cp_error (F2FS_I_SB (inode)))) +return -EIO ; + err =setattr_prepare (dentry, attr);if (err)return err;@@ -1459,6 +1473,9 @@ static long f2fs_fallocate(struct file *file, int mode,struct inode *inode =file_inode (file);long ret =0 ; +if (unlikely (f2fs_cp_error (F2FS_I_SB (inode)))) +return -EIO ; +/* f2fs only support ->fallocate for regular file */ if (!S_ISREG (inode->i_mode))return -EINVAL ;@@ -2637,6 +2654,9 @@ static int f2fs_ioc_fssetxattr(struct file *filp, unsigned long arg)long f2fs_ioctl (struct file *filp,unsigned int cmd,unsigned long arg) { +if (unlikely (f2fs_cp_error (F2FS_I_SB (file_inode (filp))))) +return -EIO ; +switch (cmd) {case F2FS_IOC_GETFLAGS :return f2fs_ioc_getflags (filp, arg);@@ -2694,6 +2714,9 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)struct blk_plug plug;ssize_t ret; +if (unlikely (f2fs_cp_error (F2FS_I_SB (inode)))) +return -EIO ; +inode_lock (inode); ret =generic_write_checks (iocb, from);if (ret >0 ) {fs/f2fs/namei.c +30
-0@@ -183,6 +183,9 @@ static int f2fs_create(struct inode *dir, struct dentry *dentry, umode_t mode,nid_t ino =0 ;int err; +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; + err =dquot_initialize (dir);if (err)return err;@@ -227,6 +230,9 @@ static int f2fs_link(struct dentry *old_dentry, struct inode *dir,struct f2fs_sb_info *sbi =F2FS_I_SB (dir);int err; +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; +if (f2fs_encrypted_inode (dir) && !fscrypt_has_permitted_context (dir, inode))return -EPERM ;@@ -426,6 +432,9 @@ static int f2fs_unlink(struct inode *dir, struct dentry *dentry)trace_f2fs_unlink_enter (dir, dentry); +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; + err =dquot_initialize (dir);if (err)return err;@@ -481,6 +490,9 @@ static int f2fs_symlink(struct inode *dir, struct dentry *dentry,struct fscrypt_symlink_data *sd =NULL ;int err; +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; +if (f2fs_encrypted_inode (dir)) { err =fscrypt_get_encryption_info (dir);if (err)@@ -587,6 +599,9 @@ static int f2fs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)struct inode *inode;int err; +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; + err =dquot_initialize (dir);if (err)return err;@@ -639,6 +654,9 @@ static int f2fs_mknod(struct inode *dir, struct dentry *dentry,struct inode *inode;int err =0 ; +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; + err =dquot_initialize (dir);if (err)return err;@@ -733,6 +751,9 @@ static int __f2fs_tmpfile(struct inode *dir, struct dentry *dentry,static int f2fs_tmpfile (struct inode *dir,struct dentry *dentry,umode_t mode) { +if (unlikely (f2fs_cp_error (F2FS_I_SB (dir)))) +return -EIO ; +if (f2fs_encrypted_inode (dir)) {int err =fscrypt_get_encryption_info (dir);if (err)@@ -744,6 +765,9 @@ static int f2fs_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode)static int f2fs_create_whiteout (struct inode *dir,struct inode **whiteout) { +if (unlikely (f2fs_cp_error (F2FS_I_SB (dir)))) +return -EIO ; +return __f2fs_tmpfile (dir,NULL ,S_IFCHR |WHITEOUT_MODE , whiteout); }@@ -763,6 +787,9 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry,bool is_old_inline =f2fs_has_inline_dentry (old_dir);int err = -ENOENT ; +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; + if ((f2fs_encrypted_inode(old_dir) && !fscrypt_has_encryption_key(old_dir)) || (f2fs_encrypted_inode(new_dir) &&@@ -956,6 +983,9 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry,int old_nlink =0 , new_nlink =0 ;int err = -ENOENT ; +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; + if ((f2fs_encrypted_inode(old_dir) && !fscrypt_has_encryption_key(old_dir)) || (f2fs_encrypted_inode(new_dir) &&fs/f2fs/super.c +0
-0fs/f2fs/super.c int f2fs_sync_fs(struct super_block *sb, int sync) · line 893
Quoted 9 lines
fs/f2fs/super.c +3
-0@@ -885,6 +885,9 @@ int f2fs_sync_fs(struct super_block *sb, int sync)struct f2fs_sb_info *sbi =F2FS_SB (sb);int err =0 ; +if (unlikely (f2fs_cp_error (sbi))) +return 0 ; +trace_f2fs_sync_fs (sb, sync);if (unlikely (is_sbi_flag_set (sbi,SBI_POR_DOING )))------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Linux-f2fs-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Jaegeuk Kim
maintainerRe: [f2fs-dev] [PATCH 2/2] f2fs: stop all the operations by cp_error flag
Quoted 9 lines · Chao Yu
Hi Jaegeuk,
Quoted 2 lines · Chao Yu
Quoted 1 line · Jaegeuk Kim
This patch replaces to use
cp_errorflag instead of RDONLY for quota off.We should convert error number with
block_page_mkwrite_returnin .page_mkwrite, otherwise generic/019 will cause a deadlock issue with below kernel message printed:
Fixed. :)
Thanks,
Quoted 339 lines
============================================
WARNING: possible recursive locking detected
4.14.0-rc1 #35 Tainted: G W O
--------------------------------------------
fio/5845 is trying to acquire lock:
(&mm->mmap_sem){++++}, at: [<c104be02>]__do_page_fault+0x482/0x510but task is already holding lock:
(&mm->mmap_sem){++++}, at: [<c104ba9e>]__do_page_fault+0x11e/0x510other info that might help us debug this:
Possible unsafe locking scenario:CPU0 ----
lock(&mm->mmap_sem);
lock(&mm->mmap_sem);*** DEADLOCK ***
May be due to missing lock nesting notation
1 lock held by fio/5845:
#0: (&mm->mmap_sem){++++}, at: [<c104ba9e>]__do_page_fault+0x11e/0x510stack backtrace: CPU: 3 PID: 5845 Comm: fio Tainted: G W O 4.14.0-rc1 #35 Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS VirtualBox 12/01/2006 Call Trace: dump_stack+0x5f/0x92 __lock_acquire+0x1019/0x12c0 lock_acquire+0xae/0x220 down_read+0x38/0x60 __do_page_fault+0x482/0x510 do_page_fault+0x26/0x290 common_exception+0x64/0x6a--- fs/f2fs/file.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)fs/f2fs/file.c +7
-4@@ -53,8 +53,10 @@ static int f2fs_vm_page_mkwrite(struct vm_fault *vmf)struct dnode_of_data dn;int err; -if (unlikely (f2fs_cp_error (sbi))) -return -EIO ; +if (unlikely (f2fs_cp_error (sbi))) { + err = -EIO ; + goto out; + }sb_start_pagefault (inode->i_sb);@@ -66,7 +68,7 @@ static int f2fs_vm_page_mkwrite(struct vm_fault *vmf) err =f2fs_reserve_block (&dn, page->index);if (err) {f2fs_unlock_op (sbi); - goto out; + goto out_end; }f2fs_put_dnode (&dn);f2fs_unlock_op (sbi);@@ -114,9 +116,10 @@ static int f2fs_vm_page_mkwrite(struct vm_fault *vmf) out_sem:up_read (&F2FS_I (inode)->i_mmap_sem); -out: +out_end:sb_end_pagefault (inode->i_sb);f2fs_update_time (sbi,REQ_TIME ); +out:return block_page_mkwrite_return (err); }Signature · 1 line
Thanks,Quoted 253 lines
Quoted 2 lines
Signed-off-by Jaegeuk Kim <[email protected]>Reviewed-by Chao Yu <[email protected]>Thanks,
Quoted 227 lines
--- fs/f2fs/acl.c | 3 +++ fs/f2fs/checkpoint.c | 1 - fs/f2fs/file.c | 23 +++++++++++++++++++++++ fs/f2fs/namei.c | 30 ++++++++++++++++++++++++++++++ fs/f2fs/super.c | 3 +++ 5 files changed, 59 insertions(+), 1 deletion(-)fs/f2fs/acl.c +3
-0@@ -254,6 +254,9 @@ static int __f2fs_set_acl(struct inode *inode, int type,int f2fs_set_acl (struct inode *inode,struct posix_acl *acl,int type) { +if (unlikely (f2fs_cp_error (F2FS_I_SB (inode)))) +return -EIO ; +return __f2fs_set_acl (inode, type, acl,NULL ); }fs/f2fs/checkpoint.c +0
-1@@ -29,7 +29,6 @@ struct kmem_cache *inode_entry_slab;void f2fs_stop_checkpoint (struct f2fs_sb_info *sbi,bool end_io) {set_ckpt_flags (sbi,CP_ERROR_FLAG ); - sbi->sb->s_flags |=MS_RDONLY ;if (!end_io)f2fs_flush_merged_writes (sbi); }fs/f2fs/file.c +23
-0@@ -53,6 +53,9 @@ static int f2fs_vm_page_mkwrite(struct vm_fault *vmf)struct dnode_of_data dn;int err; +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; +sb_start_pagefault (inode->i_sb);f2fs_bug_on (sbi,f2fs_has_inline_data (inode));@@ -310,6 +313,8 @@ static int f2fs_do_sync_file(struct file *file, loff_t start, loff_t end,int f2fs_sync_file (struct file *file,loff_t start,loff_t end,int datasync) { +if (unlikely (f2fs_cp_error (F2FS_I_SB (file_inode (file))))) +return -EIO ;return f2fs_do_sync_file (file, start, end, datasync, false); }@@ -446,6 +451,9 @@ static int f2fs_file_mmap(struct file *file, struct vm_area_struct *vma)struct inode *inode =file_inode (file);int err; +if (unlikely (f2fs_cp_error (F2FS_I_SB (inode)))) +return -EIO ; +/* we don't need to use inline_data strictly */ err =f2fs_convert_inline_inode (inode);if (err)@@ -632,6 +640,9 @@ int f2fs_truncate(struct inode *inode) {int err; +if (unlikely (f2fs_cp_error (F2FS_I_SB (inode)))) +return -EIO ; +if (!(S_ISREG (inode->i_mode) ||S_ISDIR (inode->i_mode) ||S_ISLNK (inode->i_mode)))return 0 ;@@ -731,6 +742,9 @@ int f2fs_setattr(struct dentry *dentry, struct iattr *attr)int err;bool size_changed = false; +if (unlikely (f2fs_cp_error (F2FS_I_SB (inode)))) +return -EIO ; + err =setattr_prepare (dentry, attr);if (err)return err;@@ -1459,6 +1473,9 @@ static long f2fs_fallocate(struct file *file, int mode,struct inode *inode =file_inode (file);long ret =0 ; +if (unlikely (f2fs_cp_error (F2FS_I_SB (inode)))) +return -EIO ; +/* f2fs only support ->fallocate for regular file */ if (!S_ISREG (inode->i_mode))return -EINVAL ;@@ -2637,6 +2654,9 @@ static int f2fs_ioc_fssetxattr(struct file *filp, unsigned long arg)long f2fs_ioctl (struct file *filp,unsigned int cmd,unsigned long arg) { +if (unlikely (f2fs_cp_error (F2FS_I_SB (file_inode (filp))))) +return -EIO ; +switch (cmd) {case F2FS_IOC_GETFLAGS :return f2fs_ioc_getflags (filp, arg);@@ -2694,6 +2714,9 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)struct blk_plug plug;ssize_t ret; +if (unlikely (f2fs_cp_error (F2FS_I_SB (inode)))) +return -EIO ; +inode_lock (inode); ret =generic_write_checks (iocb, from);if (ret >0 ) {fs/f2fs/namei.c +30
-0@@ -183,6 +183,9 @@ static int f2fs_create(struct inode *dir, struct dentry *dentry, umode_t mode,nid_t ino =0 ;int err; +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; + err =dquot_initialize (dir);if (err)return err;@@ -227,6 +230,9 @@ static int f2fs_link(struct dentry *old_dentry, struct inode *dir,struct f2fs_sb_info *sbi =F2FS_I_SB (dir);int err; +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; +if (f2fs_encrypted_inode (dir) && !fscrypt_has_permitted_context (dir, inode))return -EPERM ;@@ -426,6 +432,9 @@ static int f2fs_unlink(struct inode *dir, struct dentry *dentry)trace_f2fs_unlink_enter (dir, dentry); +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; + err =dquot_initialize (dir);if (err)return err;@@ -481,6 +490,9 @@ static int f2fs_symlink(struct inode *dir, struct dentry *dentry,struct fscrypt_symlink_data *sd =NULL ;int err; +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; +if (f2fs_encrypted_inode (dir)) { err =fscrypt_get_encryption_info (dir);if (err)@@ -587,6 +599,9 @@ static int f2fs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)struct inode *inode;int err; +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; + err =dquot_initialize (dir);if (err)return err;@@ -639,6 +654,9 @@ static int f2fs_mknod(struct inode *dir, struct dentry *dentry,struct inode *inode;int err =0 ; +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; + err =dquot_initialize (dir);if (err)return err;@@ -733,6 +751,9 @@ static int __f2fs_tmpfile(struct inode *dir, struct dentry *dentry,static int f2fs_tmpfile (struct inode *dir,struct dentry *dentry,umode_t mode) { +if (unlikely (f2fs_cp_error (F2FS_I_SB (dir)))) +return -EIO ; +if (f2fs_encrypted_inode (dir)) {int err =fscrypt_get_encryption_info (dir);if (err)@@ -744,6 +765,9 @@ static int f2fs_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode)static int f2fs_create_whiteout (struct inode *dir,struct inode **whiteout) { +if (unlikely (f2fs_cp_error (F2FS_I_SB (dir)))) +return -EIO ; +return __f2fs_tmpfile (dir,NULL ,S_IFCHR |WHITEOUT_MODE , whiteout); }@@ -763,6 +787,9 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry,bool is_old_inline =f2fs_has_inline_dentry (old_dir);int err = -ENOENT ; +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; + if ((f2fs_encrypted_inode(old_dir) && !fscrypt_has_encryption_key(old_dir)) || (f2fs_encrypted_inode(new_dir) &&@@ -956,6 +983,9 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry,int old_nlink =0 , new_nlink =0 ;int err = -ENOENT ; +if (unlikely (f2fs_cp_error (sbi))) +return -EIO ; + if ((f2fs_encrypted_inode(old_dir) && !fscrypt_has_encryption_key(old_dir)) || (f2fs_encrypted_inode(new_dir) &&fs/f2fs/super.c +0
-0fs/f2fs/super.c int f2fs_sync_fs(struct super_block *sb, int sync) · line 893
Quoted 9 lines
fs/f2fs/super.c +3
-0@@ -885,6 +885,9 @@ int f2fs_sync_fs(struct super_block *sb, int sync)struct f2fs_sb_info *sbi =F2FS_SB (sb);int err =0 ; +if (unlikely (f2fs_cp_error (sbi))) +return 0 ; +trace_f2fs_sync_fs (sb, sync);if (unlikely (is_sbi_flag_set (sbi,SBI_POR_DOING )))------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Linux-f2fs-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
Quoted 12 lines · Jaegeuk Kim
This patch adds to call
quota_intializeinf2fs_set_acl.Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/acl.c | 4 ++++ 1 file changed, 4 insertions(+)fs/f2fs/acl.c +0
-0
fs/f2fs/acl.c static int __f2fs_set_acl(struct inode *inode, int type, · line 214
Quoted 6 lines
fs/f2fs/acl.c +3
-0@@ -209,6 +209,10 @@ static int __f2fs_set_acl(struct inode *inode, int type,int error;umode_t mode = inode->i_mode; + error =dquot_initialize (inode); +if (error) +return error;
Could you move this to f2fs_setxattr, and also add missing dquot_initialize in unlink and rename like ext4?
Thanks,
Quoted 5 lines
fs/f2fs/acl.c +1
-0+switch (type) {case ACL_TYPE_ACCESS : name_index =F2FS_XATTR_INDEX_POSIX_ACL_ACCESS ;
Jaegeuk Kim
maintainerQuoted 16 lines · Chao Yu
Quoted 15 lines · Jaegeuk Kim
This patch adds to call
quota_intializeinf2fs_set_acl.Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/acl.c | 4 ++++ 1 file changed, 4 insertions(+)fs/f2fs/acl.c +0
-0@@ -209,6 +209,10 @@ static int __f2fs_set_acl(struct inode *inode, int type,int error;umode_t mode = inode->i_mode;
Quoted 6 lines
fs/f2fs/acl.c static int __f2fs_set_acl(struct inode *inode, int type, · line 214
Quoted 3 lines
fs/f2fs/acl.c +3
-0+ error =dquot_initialize (inode); +if (error) +return error;Could you move this to
f2fs_setxattr, and also add missingdquot_initializein unlink and rename like ext4?
I've checked that f2fs_unlink and f2fs_rename are calling dquot_initialize().
Thanks,
Quoted 8 lines
Thanks,
Quoted 5 lines
fs/f2fs/acl.c +1
-0+switch (type) {case ACL_TYPE_ACCESS : name_index =F2FS_XATTR_INDEX_POSIX_ACL_ACCESS ;
Quoted 17 lines · Jaegeuk Kim
Quoted 16 lines · Chao Yu
Quoted 15 lines · Jaegeuk Kim
This patch adds to call
quota_intializeinf2fs_set_acl.Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/acl.c | 4 ++++ 1 file changed, 4 insertions(+)fs/f2fs/acl.c +0
-0@@ -209,6 +209,10 @@ static int __f2fs_set_acl(struct inode *inode, int type,int error;umode_t mode = inode->i_mode;
Quoted 8 lines
Quoted 6 lines
fs/f2fs/acl.c static int __f2fs_set_acl(struct inode *inode, int type, · line 214
Quoted 3 lines
fs/f2fs/acl.c +3
-0+ error =dquot_initialize (inode); +if (error) +return error;Could you move this to
f2fs_setxattr, and also add missingdquot_initializein unlink and rename like ext4?I've checked that
f2fs_unlinkandf2fs_renameare callingdquot_initialize().
ext4_unlink:
retval = dquot_initialize(dir); if (retval) return retval; retval = dquot_initialize(d_inode(dentry)); if (retval) return retval;
f2fs_unlink:
err = dquot_initialize(dir); if (err) return err;
ext4_rename
retval = dquot_initialize(old.dir);
if (retval)
return retval;
retval = dquot_initialize(new.dir);
if (retval)
return retval;
/* Initialize quotas before so that eventual writes go
* in separate transaction */
if (new.inode) {
retval = dquot_initialize(new.inode);
if (retval)
return retval;
}f2fs_rename
err = dquot_initialize(old_dir); if (err) goto out; err = dquot_initialize(new_dir); if (err) goto out;
ext4 call one more dquot_initialize than f2fs, I didn't look into this in detail, but it's better to check that. :)
Thanks,
Quoted 14 lines
Thanks,
Quoted 8 lines
Thanks,
Quoted 5 lines
fs/f2fs/acl.c +1
-0+switch (type) {case ACL_TYPE_ACCESS : name_index =F2FS_XATTR_INDEX_POSIX_ACL_ACCESS ;.
Jaegeuk Kim
maintainerQuoted 69 lines · Chao Yu
Quoted 17 lines · Jaegeuk Kim
Quoted 16 lines · Chao Yu
Quoted 15 lines · Jaegeuk Kim
This patch adds to call
quota_intializeinf2fs_set_acl.Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/acl.c | 4 ++++ 1 file changed, 4 insertions(+)fs/f2fs/acl.c +0
-0@@ -209,6 +209,10 @@ static int __f2fs_set_acl(struct inode *inode, int type,int error;umode_t mode = inode->i_mode;Quoted 8 lines
Quoted 6 lines
fs/f2fs/acl.c static int __f2fs_set_acl(struct inode *inode, int type, · line 214
Quoted 3 lines
fs/f2fs/acl.c +3
-0+ error =dquot_initialize (inode); +if (error) +return error;Could you move this to
f2fs_setxattr, and also add missingdquot_initializein unlink and rename like ext4?I've checked that
f2fs_unlinkandf2fs_renameare callingdquot_initialize().
ext4_unlink:retval = dquot_initialize(dir); if (retval) return retval; retval = dquot_initialize(d_inode(dentry)); if (retval) return retval;
f2fs_unlink:err = dquot_initialize(dir); if (err) return err;
ext4_renameretval = dquot_initialize(old.dir); if (retval) return retval; retval = dquot_initialize(new.dir); if (retval) return retval; /* Initialize quotas before so that eventual writes go * in separate transaction */ if (new.inode) { retval = dquot_initialize(new.inode); if (retval) return retval; }
f2fs_renameerr = dquot_initialize(old_dir); if (err) goto out; err = dquot_initialize(new_dir); if (err) goto out;
Quoted 2 lines
ext4 call one more
dquot_initializethan f2fs, I didn't look into this in detail, but it's better to check that. :)
Ah, okay. :)
This patch adds to call quota_intialize in f2fs_set_acl, f2fs_unlink, and f2fs_rename.
--- fs/f2fs/namei.c | 9 +++++++++ fs/f2fs/xattr.c | 4 ++++ 2 files changed, 13 insertions(+)
fs/f2fs/namei.c +9 -0
@@ -436,6 +436,9 @@ static int f2fs_unlink(struct inode *dir, struct dentry *dentry)return -EIO ; err =dquot_initialize (dir); +if (err) +return err; + err =dquot_initialize (inode);if (err)return err;
@@ -815,6 +818,12 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry,if (err) goto out; +if (new_inode) { + err =dquot_initialize (new_inode); +if (err) + goto out; + } + old_entry =f2fs_find_entry (old_dir, &old_dentry->d_name, &old_page);if (!old_entry) {if (IS_ERR (old_page))
fs/f2fs/xattr.c +4 -0
@@ -686,6 +686,10 @@ int f2fs_setxattr(struct inode *inode, int index, const char *name,struct f2fs_sb_info *sbi =F2FS_I_SB (inode);int err; + err =dquot_initialize (inode); +if (err) +return err; +/* this case is only from init_inode_metadata */ if (ipage) return __f2fs_setxattr(inode, index, name, value,
Signature · 1 line
2.14.0.rc1.383.gd1ce394fe2-goog
Quoted 73 lines · Jaegeuk Kim
Quoted 69 lines · Chao Yu
Quoted 17 lines · Jaegeuk Kim
Quoted 16 lines · Chao Yu
Quoted 15 lines · Jaegeuk Kim
This patch adds to call
quota_intializeinf2fs_set_acl.Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/acl.c | 4 ++++ 1 file changed, 4 insertions(+)fs/f2fs/acl.c +0
-0@@ -209,6 +209,10 @@ static int __f2fs_set_acl(struct inode *inode, int type,int error;umode_t mode = inode->i_mode;Quoted 8 lines
Quoted 6 lines
fs/f2fs/acl.c static int __f2fs_set_acl(struct inode *inode, int type, · line 214
Quoted 3 lines
fs/f2fs/acl.c +3
-0+ error =dquot_initialize (inode); +if (error) +return error;Could you move this to
f2fs_setxattr, and also add missingdquot_initializein unlink and rename like ext4?I've checked that
f2fs_unlinkandf2fs_renameare callingdquot_initialize().
ext4_unlink:retval = dquot_initialize(dir); if (retval) return retval; retval = dquot_initialize(d_inode(dentry)); if (retval) return retval;
f2fs_unlink:err = dquot_initialize(dir); if (err) return err;
ext4_renameretval = dquot_initialize(old.dir); if (retval) return retval; retval = dquot_initialize(new.dir); if (retval) return retval; /* Initialize quotas before so that eventual writes go * in separate transaction */ if (new.inode) { retval = dquot_initialize(new.inode); if (retval) return retval; }
f2fs_renameerr = dquot_initialize(old_dir); if (err) goto out; err = dquot_initialize(new_dir); if (err) goto out;Quoted 2 lines
ext4 call one more
dquot_initializethan f2fs, I didn't look into this in detail, but it's better to check that. :)
Quoted 6 lines
Ah, okay. :)
This patch adds to call
quota_intializeinf2fs_set_acl,f2fs_unlink, andf2fs_rename.Signed-off-by Jaegeuk Kim <[email protected]>
Thanks,
Quoted 48 lines
--- fs/f2fs/namei.c | 9 +++++++++ fs/f2fs/xattr.c | 4 ++++ 2 files changed, 13 insertions(+)fs/f2fs/namei.c +9
-0@@ -436,6 +436,9 @@ static int f2fs_unlink(struct inode *dir, struct dentry *dentry)return -EIO ; err =dquot_initialize (dir); +if (err) +return err; + err =dquot_initialize (inode);if (err)return err;@@ -815,6 +818,12 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry,if (err) goto out; +if (new_inode) { + err =dquot_initialize (new_inode); +if (err) + goto out; + } + old_entry =f2fs_find_entry (old_dir, &old_dentry->d_name, &old_page);if (!old_entry) {if (IS_ERR (old_page))fs/f2fs/xattr.c +4
-0@@ -686,6 +686,10 @@ int f2fs_setxattr(struct inode *inode, int index, const char *name,struct f2fs_sb_info *sbi =F2FS_I_SB (inode);int err; + err =dquot_initialize (inode); +if (err) +return err; +/* this case is only from init_inode_metadata */ if (ipage) return __f2fs_setxattr(inode, index, name, value,
Jaegeuk Kim
maintainerThis patch adds to call quota_intialize in f2fs_set_acl.
--- fs/f2fs/xattr.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/f2fs/xattr.c +4 -0
@@ -686,6 +686,10 @@ int f2fs_setxattr(struct inode *inode, int index, const char *name,struct f2fs_sb_info *sbi =F2FS_I_SB (inode);int err; + err =dquot_initialize (inode); +if (err) +return err; +/* this case is only from init_inode_metadata */ if (ipage) return __f2fs_setxattr(inode, index, name, value,
Signature · 1 line
2.14.0.rc1.383.gd1ce394fe2-goog