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

Commit f75ff22e 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 b294d6aa

fs/f2fs/file.c

+3 −3
Original line number Diff line number Diff line
@@ -687,7 +687,7 @@ int f2fs_getattr(struct vfsmount *mnt, 
		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)
@@ -1638,8 +1638,8 @@ static int f2fs_ioc_setflags(struct file *filp, unsigned long arg) 
		}

	}



	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;



	inode->i_ctime = current_time(inode);