Skip to content

Commit bbf156f

Browse files
author
Jaegeuk Kim
committed
f2fs: fix lost xattrs of directories
This patch enhances the xattr consistency of dirs from suddern power-cuts. Possible scenario would be: 1. dir->setxattr used by per-file encryption 2. file->setxattr goes into inline_xattr 3. file->fsync In that case, we should do checkpoint for #1. Otherwise we'd lose dir's key information for the file given #2. Signed-off-by: Jaegeuk Kim <[email protected]>
1 parent 275b66b commit bbf156f

File tree

4 files changed

+6
-0
lines changed

4 files changed

+6
-0
lines changed

fs/f2fs/checkpoint.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1152,6 +1152,7 @@ static int do_checkpoint(struct f2fs_sb_info *sbi, struct cp_control *cpc)
11521152

11531153
clear_prefree_segments(sbi, cpc);
11541154
clear_sbi_flag(sbi, SBI_IS_DIRTY);
1155+
clear_sbi_flag(sbi, SBI_NEED_CP);
11551156

11561157
return 0;
11571158
}

fs/f2fs/f2fs.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -756,6 +756,7 @@ enum {
756756
SBI_NEED_FSCK, /* need fsck.f2fs to fix */
757757
SBI_POR_DOING, /* recovery is doing or not */
758758
SBI_NEED_SB_WRITE, /* need to recover superblock */
759+
SBI_NEED_CP, /* need to checkpoint */
759760
};
760761

761762
enum {

fs/f2fs/file.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,8 @@ static inline bool need_do_checkpoint(struct inode *inode)
135135

136136
if (!S_ISREG(inode->i_mode) || inode->i_nlink != 1)
137137
need_cp = true;
138+
else if (is_sbi_flag_set(sbi, SBI_NEED_CP))
139+
need_cp = true;
138140
else if (file_enc_name(inode) && need_dentry_mark(sbi, inode->i_ino))
139141
need_cp = true;
140142
else if (file_wrong_pino(inode))

fs/f2fs/xattr.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -548,6 +548,8 @@ static int __f2fs_setxattr(struct inode *inode, int index,
548548
!strcmp(name, F2FS_XATTR_NAME_ENCRYPTION_CONTEXT))
549549
f2fs_set_encrypted_inode(inode);
550550
f2fs_mark_inode_dirty_sync(inode);
551+
if (!error && S_ISDIR(inode->i_mode))
552+
set_sbi_flag(F2FS_I_SB(inode), SBI_NEED_CP);
551553
exit:
552554
kzfree(base_addr);
553555
return error;

0 commit comments

Comments
 (0)