f2fs: fix wrong check on F2FS_IOC_FSSETXATTR
Jaegeuk Kim
maintainerPATCH 1/1 f2fs: fix wrong check on F2FS_IOC_FSSETXATTR
This fixes the incorrect failure when enabling project quota on casefold-enabled file.
--- fs/f2fs/file.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
fs/f2fs/file.c +11 -8
@@ -1789,12 +1789,15 @@ static int f2fs_file_flush(struct file *file, fl_owner_t id)static int f2fs_setflags_common (struct inode *inode,u32 iflags,u32 mask) {struct f2fs_inode_info *fi =F2FS_I (inode); +u32 masked_flags = fi->i_flags & mask; + +f2fs_bug_on (F2FS_I_SB (inode), (iflags & ~mask));/* Is it quota file? Do not allow user to mess with it */ if (IS_NOQUOTA (inode))return -EPERM ; -if ((iflags ^ fi->i_flags) &F2FS_CASEFOLD_FL ) { +if ((iflags ^ masked_flags) &F2FS_CASEFOLD_FL ) {if (!f2fs_sb_has_casefold (F2FS_I_SB (inode)))return -EOPNOTSUPP ;if (!f2fs_empty_dir (inode))
@@ -1808,9 +1811,9 @@ static int f2fs_setflags_common(struct inode *inode, u32 iflags, u32 mask)return -EINVAL ; } -if ((iflags ^ fi->i_flags) &F2FS_COMPR_FL ) { +if ((iflags ^ masked_flags) &F2FS_COMPR_FL ) {if (S_ISREG (inode->i_mode) && - (fi->i_flags &F2FS_COMPR_FL ||i_size_read (inode) || + (masked_flags &F2FS_COMPR_FL ||i_size_read (inode) ||F2FS_HAS_BLOCKS (inode)))return -EINVAL ;if (iflags &F2FS_NOCOMP_FL )
@@ -1827,16 +1830,16 @@ static int f2fs_setflags_common(struct inode *inode, u32 iflags, u32 mask)set_compress_context (inode); } } -if ((iflags ^ fi->i_flags) &F2FS_NOCOMP_FL ) { -if (fi->i_flags &F2FS_COMPR_FL ) +if ((iflags ^ masked_flags) &F2FS_NOCOMP_FL ) { +if (masked_flags &F2FS_COMPR_FL )return -EINVAL ; } fi->i_flags = iflags | (fi->i_flags & ~mask); -f2fs_bug_on (F2FS_I_SB (inode), (fi->i_flags &F2FS_COMPR_FL ) && - (fi->i_flags &F2FS_NOCOMP_FL )); +f2fs_bug_on (F2FS_I_SB (inode), (masked_flags &F2FS_COMPR_FL ) && + (masked_flags &F2FS_NOCOMP_FL )); -if (fi->i_flags &F2FS_PROJINHERIT_FL ) +if (masked_flags &F2FS_PROJINHERIT_FL )set_inode_flag (inode,FI_PROJ_INHERIT );else clear_inode_flag (inode,FI_PROJ_INHERIT );
Signature · 1 line
2.25.1.481.gfbce0eb801-goog
Quoted 48 lines · Jaegeuk Kim
This fixes the incorrect failure when enabling project quota on casefold-enabled file.
Cc Daniel Rosenberg <[email protected]>Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/file.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)fs/f2fs/file.c +6
-5@@ -1789,12 +1789,15 @@ static int f2fs_file_flush(struct file *file, fl_owner_t id)static int f2fs_setflags_common (struct inode *inode,u32 iflags,u32 mask) {struct f2fs_inode_info *fi =F2FS_I (inode); +u32 masked_flags = fi->i_flags & mask; + +f2fs_bug_on (F2FS_I_SB (inode), (iflags & ~mask));/* Is it quota file? Do not allow user to mess with it */ if (IS_NOQUOTA (inode))return -EPERM ; -if ((iflags ^ fi->i_flags) &F2FS_CASEFOLD_FL ) { +if ((iflags ^ masked_flags) &F2FS_CASEFOLD_FL ) {if (!f2fs_sb_has_casefold (F2FS_I_SB (inode)))return -EOPNOTSUPP ;if (!f2fs_empty_dir (inode))@@ -1808,9 +1811,9 @@ static int f2fs_setflags_common(struct inode *inode, u32 iflags, u32 mask)return -EINVAL ; } -if ((iflags ^ fi->i_flags) &F2FS_COMPR_FL ) { +if ((iflags ^ masked_flags) &F2FS_COMPR_FL ) {if (S_ISREG (inode->i_mode) && - (fi->i_flags &F2FS_COMPR_FL ||i_size_read (inode) || + (masked_flags &F2FS_COMPR_FL ||i_size_read (inode) ||F2FS_HAS_BLOCKS (inode)))return -EINVAL ;if (iflags &F2FS_NOCOMP_FL )@@ -1827,16 +1830,16 @@ static int f2fs_setflags_common(struct inode *inode, u32 iflags, u32 mask)set_compress_context (inode); } } -if ((iflags ^ fi->i_flags) &F2FS_NOCOMP_FL ) { -if (fi->i_flags &F2FS_COMPR_FL )
fs/f2fs/file.c static int f2fs_setflags_common(struct inode *inode, u32 iflags, u32 mask) · line 1840
Quoted 10 lines
fs/f2fs/file.c +4
-2+if ((iflags ^ masked_flags) &F2FS_NOCOMP_FL ) { +if (masked_flags &F2FS_COMPR_FL )return -EINVAL ; } fi->i_flags = iflags | (fi->i_flags & ~mask); -f2fs_bug_on (F2FS_I_SB (inode), (fi->i_flags &F2FS_COMPR_FL ) && - (fi->i_flags &F2FS_NOCOMP_FL )); +f2fs_bug_on (F2FS_I_SB (inode), (masked_flags &F2FS_COMPR_FL ) && + (masked_flags &F2FS_NOCOMP_FL ));
We don't need to change here due to we should check final status in fi->i_flags rather than checking previous status in masked_flags?
fs/f2fs/file.c static int f2fs_setflags_common(struct inode *inode, u32 iflags, u32 mask) · line 1842
Quoted 3 lines
fs/f2fs/file.c +1
-1-if (fi->i_flags &F2FS_PROJINHERIT_FL ) +if (masked_flags &F2FS_PROJINHERIT_FL )
Ditto.
Thanks,
Quoted 4 lines
fs/f2fs/file.c +0
-0set_inode_flag (inode,FI_PROJ_INHERIT ); elseclear_inode_flag (inode ,FI_PROJ_INHERIT );
Quoted 7 lines · Jaegeuk Kim
This fixes the incorrect failure when enabling project quota on casefold-enabled file.
Cc Daniel Rosenberg <[email protected]>Signed-off-by Jaegeuk Kim <[email protected]>---
This fixes the issue I was seeing, I'm just a bit concerned with the last two.
Quoted 13 lines
fi->i_flags = iflags | (fi->i_flags & ~mask);fs/f2fs/file.c +3
-4-f2fs_bug_on (F2FS_I_SB (inode), (fi->i_flags &F2FS_COMPR_FL ) && - (fi->i_flags &F2FS_NOCOMP_FL )); +f2fs_bug_on (F2FS_I_SB (inode), (masked_flags &F2FS_COMPR_FL ) && + (masked_flags &F2FS_NOCOMP_FL )); -if (fi->i_flags &F2FS_PROJINHERIT_FL ) +if (masked_flags &F2FS_PROJINHERIT_FL )set_inode_flag (inode,FI_PROJ_INHERIT );else clear_inode_flag (inode,FI_PROJ_INHERIT ); --
Quoted 2 lines
2.25.1.481.gfbce0eb801-goog
Shouldn't these still be fi->i_flags? masked_flags comes from the previously set i_flags, so this would change from testing the new combination that was just set for fi->i_flags to checking only the masked version of the old flags.
It might make it clearer to rename masked_flags to masked_old_flags, or something like that.
-Daniel
Jaegeuk Kim
maintainerThis fixes the incorrect failure when enabling project quota on casefold-enabled file.
---
log from v1:
- fix the last check
fs/f2fs/file.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
fs/f2fs/file.c +8 -5
@@ -1794,12 +1794,15 @@ static int f2fs_file_flush(struct file *file, fl_owner_t id)static int f2fs_setflags_common (struct inode *inode,u32 iflags,u32 mask) {struct f2fs_inode_info *fi =F2FS_I (inode); +u32 masked_flags = fi->i_flags & mask; + +f2fs_bug_on (F2FS_I_SB (inode), (iflags & ~mask));/* Is it quota file? Do not allow user to mess with it */ if (IS_NOQUOTA (inode))return -EPERM ; -if ((iflags ^ fi->i_flags) &F2FS_CASEFOLD_FL ) { +if ((iflags ^ masked_flags) &F2FS_CASEFOLD_FL ) {if (!f2fs_sb_has_casefold (F2FS_I_SB (inode)))return -EOPNOTSUPP ;if (!f2fs_empty_dir (inode))
@@ -1813,9 +1816,9 @@ static int f2fs_setflags_common(struct inode *inode, u32 iflags, u32 mask)return -EINVAL ; } -if ((iflags ^ fi->i_flags) &F2FS_COMPR_FL ) { +if ((iflags ^ masked_flags) &F2FS_COMPR_FL ) {if (S_ISREG (inode->i_mode) && - (fi->i_flags &F2FS_COMPR_FL ||i_size_read (inode) || + (masked_flags &F2FS_COMPR_FL ||i_size_read (inode) ||F2FS_HAS_BLOCKS (inode)))return -EINVAL ;if (iflags &F2FS_NOCOMP_FL )
@@ -1832,8 +1835,8 @@ static int f2fs_setflags_common(struct inode *inode, u32 iflags, u32 mask)set_compress_context (inode); } } -if ((iflags ^ fi->i_flags) &F2FS_NOCOMP_FL ) { -if (fi->i_flags &F2FS_COMPR_FL ) +if ((iflags ^ masked_flags) &F2FS_NOCOMP_FL ) { +if (masked_flags &F2FS_COMPR_FL )return -EINVAL ; }
Signature · 1 line
2.25.1.481.gfbce0eb801-goog
Chao Yu
Reviewed-byQuoted 6 lines · Jaegeuk Kim
This fixes the incorrect failure when enabling project quota on casefold-enabled file.
Cc Daniel Rosenberg <[email protected]>Signed-off-by Jaegeuk Kim <[email protected]>
Thanks,