f2fs: remove redundant check from f2fs_setflags_common()
Now that f2fs_ioc_setflags() and f2fs_ioc_fssetxattr() call the VFS
helper functions which check for permission to change the immutable and
append-only flags, it's no longer needed to do this check in
f2fs_setflags_common() too. So remove it.
This is based on a patch from Darrick Wong, but reworked to apply after
commit 360985573b
("f2fs: separate f2fs i_flags from fs_flags and ext4
i_flags").
Originally-from: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
parent
6fc93c4e0a
commit
d5e5efa250
@ -1653,19 +1653,12 @@ static int f2fs_file_flush(struct file *file, fl_owner_t id)
|
|||||||
static int f2fs_setflags_common(struct inode *inode, u32 iflags, u32 mask)
|
static int f2fs_setflags_common(struct inode *inode, u32 iflags, u32 mask)
|
||||||
{
|
{
|
||||||
struct f2fs_inode_info *fi = F2FS_I(inode);
|
struct f2fs_inode_info *fi = F2FS_I(inode);
|
||||||
u32 oldflags;
|
|
||||||
|
|
||||||
/* Is it quota file? Do not allow user to mess with it */
|
/* Is it quota file? Do not allow user to mess with it */
|
||||||
if (IS_NOQUOTA(inode))
|
if (IS_NOQUOTA(inode))
|
||||||
return -EPERM;
|
return -EPERM;
|
||||||
|
|
||||||
oldflags = fi->i_flags;
|
fi->i_flags = iflags | (fi->i_flags & ~mask);
|
||||||
|
|
||||||
if ((iflags ^ oldflags) & (F2FS_APPEND_FL | F2FS_IMMUTABLE_FL))
|
|
||||||
if (!capable(CAP_LINUX_IMMUTABLE))
|
|
||||||
return -EPERM;
|
|
||||||
|
|
||||||
fi->i_flags = iflags | (oldflags & ~mask);
|
|
||||||
|
|
||||||
if (fi->i_flags & F2FS_PROJINHERIT_FL)
|
if (fi->i_flags & F2FS_PROJINHERIT_FL)
|
||||||
set_inode_flag(inode, FI_PROJ_INHERIT);
|
set_inode_flag(inode, FI_PROJ_INHERIT);
|
||||||
|
Loading…
Reference in New Issue
Block a user