Christian Brauner <brauner@xxxxxxxxxx> writes:
> On Fri, Sep 09, 2022 at 09:33:12PM +0900, OGAWA Hirofumi wrote:
>> Christian Brauner <brauner@xxxxxxxxxx> writes:
>>
>> Ah, I was expecting almost all convert patches goes at once via you or
>> vfs git. However, if you want this goes via me, please let me know.
>
> The patch is standalone which is why it would be great if you could just
> take it. :)
Ok, Please queuing this patch, akpm.
Thanks.
From: Christian Brauner <brauner@xxxxxxxxxx>
Subject: [PATCH] fat: port to vfs{g,u}id_t and associated helpers
A while ago we introduced a dedicated vfs{g,u}id_t type in commit
1e5267cd0895 ("mnt_idmapping: add vfs{g,u}id_t"). We already switched
over a good part of the VFS. Ultimately we will remove all legacy
idmapped mount helpers that operate only on k{g,u}id_t in favor of the
new type safe helpers that operate on vfs{g,u}id_t.
Cc: Seth Forshee (Digital Ocean) <sforshee@xxxxxxxxxx>
Cc: Christoph Hellwig <hch@xxxxxx>
Cc: linux-fsdevel@xxxxxxxxxxxxxxx
Acked-by: OGAWA Hirofumi <hirofumi@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Christian Brauner (Microsoft) <brauner@xxxxxxxxxx>
---
fs/fat/file.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/fs/fat/file.c b/fs/fat/file.c
index 3e4eb3467cb4..8a6b493b5b5f 100644
--- a/fs/fat/file.c
+++ b/fs/fat/file.c
@@ -461,8 +461,9 @@ static int fat_allow_set_time(struct user_namespace *mnt_userns,
{
umode_t allow_utime = sbi->options.allow_utime;
- if (!uid_eq(current_fsuid(), i_uid_into_mnt(mnt_userns, inode))) {
- if (in_group_p(i_gid_into_mnt(mnt_userns, inode)))
+ if (!vfsuid_eq_kuid(i_uid_into_vfsuid(mnt_userns, inode),
+ current_fsuid())) {
+ if (vfsgid_in_group_p(i_gid_into_vfsgid(mnt_userns, inode)))
allow_utime >>= 3;
if (allow_utime & MAY_WRITE)
return 1;
base-commit: 7e18e42e4b280c85b76967a9106a13ca61c16179
--
2.34.1
--
OGAWA Hirofumi <hirofumi@xxxxxxxxxxxxxxxxxx>
