Skip to contentSkip to conversation

f2fs: fix to recover inode's uid/gid during POR

PATCH In review Chao Yu 3 participants 5 messages Sep 20, 2018 – Sep 21, 2018 F2FS file system

lore
Share & tools
lore

Chao Yu

author
#0 lore raw

PATCH 1/1 f2fs: fix to recover inode's uid/gid during POR

Step to reproduce this bug:
1. logon as root
2. mount -t f2fs /dev/sdd /mnt;
3. touch /mnt/file;
4. chown system /mnt/file; chgrp system /mnt/file;
5. xfs_io -f /mnt/file -c "fsync";
6. godown /mnt;
7. umount /mnt;
8. mount -t f2fs /dev/sdd /mnt;

After step 8) we will expect file's uid/gid are all system, but during recovery, these two fields were not been recovered, fix it.

---
 fs/f2fs/recovery.c | 2 ++
 1 file changed, 2 insertions(+)
fs/f2fs/recovery.c +2 -0
index ba678efe7cad..da9f59b9044e 100644
@@ -209,6 +209,8 @@ static void recover_inode(struct inode *inode, struct page *page)
 	char *name;
 
 	inode->i_mode = le16_to_cpu(raw->i_mode);
+	i_uid_write(inode, le32_to_cpu(raw->i_uid));
+	i_gid_write(inode, le32_to_cpu(raw->i_gid));
 	f2fs_i_size_write(inode, le64_to_cpu(raw->i_size));
 	inode->i_atime.tv_sec = le64_to_cpu(raw->i_atime);
 	inode->i_ctime.tv_sec = le64_to_cpu(raw->i_ctime);
Signature · 1 line
2.18.0.rc1
maintainer
#1 lore raw
Quoted 10 lines · Chao Yu

Step to reproduce this bug:
1. logon as root
2. mount -t f2fs /dev/sdd /mnt;
3. touch /mnt/file;
4. chown system /mnt/file; chgrp system /mnt/file;
5. xfs_io -f /mnt/file -c "fsync";
6. godown /mnt;
7. umount /mnt;
8. mount -t f2fs /dev/sdd /mnt;

Quoted 2 lines

After step 8) we will expect file's uid/gid are all system, but during recovery, these two fields were not been recovered, fix it.

Hmm, I tried this before, but wasn't enough to fix everything. :(

Quoted 21 lines
---
 fs/f2fs/recovery.c | 2 ++
 1 file changed, 2 insertions(+)
fs/f2fs/recovery.c +2 -0
index ba678efe7cad..da9f59b9044e 100644
@@ -209,6 +209,8 @@ static void recover_inode(struct inode *inode, struct page *page)
 	char *name;
 
 	inode->i_mode = le16_to_cpu(raw->i_mode);
+	i_uid_write(inode, le32_to_cpu(raw->i_uid));
+	i_gid_write(inode, le32_to_cpu(raw->i_gid));
 	f2fs_i_size_write(inode, le64_to_cpu(raw->i_size));
 	inode->i_atime.tv_sec = le64_to_cpu(raw->i_atime);
 	inode->i_ctime.tv_sec = le64_to_cpu(raw->i_ctime);
Signature · 1 line
2.18.0.rc1
#2 lore raw
In reply to Chao Yu
Quoted 9 lines · Chao Yu

Step to reproduce this bug:
1. logon as root
2. mount -t f2fs /dev/sdd /mnt;
3. touch /mnt/file;
4. chown system /mnt/file; chgrp system /mnt/file;
5. xfs_io -f /mnt/file -c "fsync";
6. godown /mnt;
7. umount /mnt;
8. mount -t f2fs /dev/sdd /mnt;

Please wire this up for xfstests (as a generic test).

author
#3 lore raw

Hi Christoph,

Quoted 11 lines · Christoph Hellwig
Quoted 9 lines · Chao Yu

Step to reproduce this bug:
1. logon as root
2. mount -t f2fs /dev/sdd /mnt;
3. touch /mnt/file;
4. chown system /mnt/file; chgrp system /mnt/file;
5. xfs_io -f /mnt/file -c "fsync";
6. godown /mnt;
7. umount /mnt;
8. mount -t f2fs /dev/sdd /mnt;

Quoted 1 line

Please wire this up for xfstests (as a generic test).

No problem, I just plan to.

Out of curiosity, are you filter some key words like 'recover' in your email client to find this so quickly?

Thanks,

Quoted 2 lines
#4 lore raw
Quoted 4 lines · Chao Yu

No problem, I just plan to.

Out of curiosity, are you filter some key words like 'recover' in your email client to find this so quickly?

No, I just do a quick glanceof lkml every morning, and this just caught my eye.