f2fs: use correct errno
Subsystems (2)
Jaegeuk Kim
maintainerPATCH 1/3 f2fs: use correct errno
This patch is to fix misused error number.
Signed-off-by Jaegeuk Kim <[email protected]>
--- fs/f2fs/segment.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/f2fs/segment.c +1 -1
@@ -505,7 +505,7 @@ static int f2fs_issue_discard(struct f2fs_sb_info *sbi,bool discard_next_dnode (struct f2fs_sb_info *sbi,block_t blkaddr) { -int err = -ENOTSUPP ; +int err = -EOPNOTSUPP ;if (test_opt (sbi,DISCARD )) { struct seg_entry *se = get_seg_entry(sbi,
Signature · 1 line
2.6.3
Jaegeuk Kim
maintainerPATCH 2/3 f2fs crypto: sync with ext4's fname padding
This patch fixes wrong adoption on fname padding.
Signed-off-by Jaegeuk Kim <[email protected]>
--- fs/f2fs/crypto_fname.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/f2fs/crypto_fname.c +3 -3
@@ -267,13 +267,13 @@ int f2fs_fname_crypto_alloc_buffer(struct inode *inode, u32 ilen, struct f2fs_str *crypto_str) {unsigned int olen; -int padding =16 ; +int padding =32 ;struct f2fs_crypt_info *ci =F2FS_I (inode)->i_crypt_info;if (ci) padding =4 << (ci->ci_flags &F2FS_POLICY_FLAGS_PAD_MASK ); -if (padding <F2FS_CRYPTO_BLOCK_SIZE ) - padding =F2FS_CRYPTO_BLOCK_SIZE ; +if (ilen <F2FS_CRYPTO_BLOCK_SIZE ) + ilen =F2FS_CRYPTO_BLOCK_SIZE ; olen =f2fs_fname_crypto_round_up (ilen, padding); crypto_str->len = olen;if (olen <F2FS_FNAME_CRYPTO_DIGEST_SIZE *2 )
Signature · 1 line
2.6.3
Jaegeuk Kim
maintainerPATCH 3/3 f2fs: avoid garbage lenghs in dentries
In reply to Jaegeuk KimThis patch fixes to eliminate garbage name lengths in dentries in order to provide correct answers of readdir.
For example, if a valid dentry consists of:
bitmap : 1 1 1 1
len : 32 0 x 0,
readdir can start with second bit_pos having len = 0. Or, it can start with third bit_pos having garbage.
In both of cases, we should avoid to try filling dentries.
So, this patch not only removes any garbage length, but also avoid entering zero length case in readdir.
Signed-off-by Jaegeuk Kim <[email protected]>
--- fs/f2fs/dir.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
fs/f2fs/dir.c +11 -1
@@ -511,8 +511,12 @@ void f2fs_update_dentry(nid_t ino, umode_t mode, struct f2fs_dentry_ptr *d,memcpy (d->filename[bit_pos], name->name, name->len); de->ino =cpu_to_le32 (ino);set_de_type (de, mode); -for (i =0 ; i < slots; i++) +for (i =0 ; i < slots; i++) {test_and_set_bit_le (bit_pos + i, (void *)d->bitmap); +/* avoid wrong garbage data for readdir */ +if (i) + (de + i)->name_len =0 ; + } }/*
@@ -792,6 +796,12 @@ bool f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d,break ; de = &d->dentry[bit_pos]; +if (de->name_len ==0 ) { + bit_pos++; + ctx->pos = start_pos + bit_pos; +continue ; + } +if (de->file_type <F2FS_FT_MAX ) d_type = f2fs_filetype_table[de->file_type];else
Signature · 1 line
2.6.3