Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dbfe915c authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: remove unneeded F2FS_PROJINHERIT_FL 



Now F2FS_FL_USER_VISIBLE and F2FS_FL_USER_MODIFIABLE has included
F2FS_PROJINHERIT_FL, so remove unneeded F2FS_PROJINHERIT_FL when
using visible/modifiable flag macro.

Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent ee8586bb

fs/f2fs/file.c

+4 −4
Original line number Diff line number Diff line
@@ -685,7 +685,7 @@ int f2fs_getattr(const struct path *path, struct kstat *stat, 
		stat->btime.tv_nsec = fi->i_crtime.tv_nsec;

	}



	flags = fi->i_flags & (F2FS_FL_USER_VISIBLE | F2FS_PROJINHERIT_FL);

	flags = fi->i_flags & F2FS_FL_USER_VISIBLE;

	if (flags & F2FS_APPEND_FL)

		stat->attributes |= STATX_ATTR_APPEND;

	if (flags & F2FS_COMPR_FL)
@@ -1605,8 +1605,8 @@ static int __f2fs_ioc_setflags(struct inode *inode, unsigned int flags) 
		if (!capable(CAP_LINUX_IMMUTABLE))

			return -EPERM;



	flags = flags & (F2FS_FL_USER_MODIFIABLE | F2FS_PROJINHERIT_FL);

	flags |= oldflags & ~(F2FS_FL_USER_MODIFIABLE | F2FS_PROJINHERIT_FL);

	flags = flags & F2FS_FL_USER_MODIFIABLE;

	flags |= oldflags & ~F2FS_FL_USER_MODIFIABLE;

	fi->i_flags = flags;



	if (fi->i_flags & F2FS_PROJINHERIT_FL)
@@ -2648,7 +2648,7 @@ static int f2fs_ioc_fsgetxattr(struct file *filp, unsigned long arg) 


	memset(&fa, 0, sizeof(struct fsxattr));

	fa.fsx_xflags = f2fs_iflags_to_xflags(fi->i_flags &

				(F2FS_FL_USER_VISIBLE | F2FS_PROJINHERIT_FL));

				F2FS_FL_USER_VISIBLE);



	if (f2fs_sb_has_project_quota(inode->i_sb))

		fa.fsx_projid = (__u32)from_kprojid(&init_user_ns,