redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

f2fs: introduce f2fs_encrypted_file for clean-up 

This patch replaces (f2fs_encrypted_inode() && S_ISREG()) with
f2fs_encrypted_file(), which gives no functional change.

Reviewed-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
hifive-unleashed-5.1
Jaegeuk Kim 2017-09-05 16:54:24 -07:00
parent 2afce76a11
commit 1958593e4f
5 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/f2fs/data.c
View File

@ -581,7 +581,7 @@ struct page *get_read_data_page(struct inode *inode, pgoff_t index,
.encrypted_page = NULL,
};
if (f2fs_encrypted_inode(inode) && S_ISREG(inode->i_mode))
if (f2fs_encrypted_file(inode))
return read_mapping_page(mapping, index, NULL);
page = f2fs_grab_cache_page(mapping, index, for_write);
@ -786,7 +786,7 @@ alloc:
static inline bool __force_buffered_io(struct inode *inode, int rw)
{
return ((f2fs_encrypted_inode(inode) && S_ISREG(inode->i_mode)) ||
return (f2fs_encrypted_file(inode) ||
(rw == WRITE && test_opt(F2FS_I_SB(inode), LFS)) ||
F2FS_I_SB(inode)->s_ndevs);
}
@ -1157,7 +1157,7 @@ static struct bio *f2fs_grab_bio(struct inode *inode, block_t blkaddr,
struct fscrypt_ctx *ctx = NULL;
struct bio *bio;
if (f2fs_encrypted_inode(inode) && S_ISREG(inode->i_mode)) {
if (f2fs_encrypted_file(inode)) {
ctx = fscrypt_get_ctx(inode, GFP_NOFS);
if (IS_ERR(ctx))
return ERR_CAST(ctx);
@ -1345,7 +1345,7 @@ static int encrypt_one_page(struct f2fs_io_info *fio)
struct inode *inode = fio->page->mapping->host;
gfp_t gfp_flags = GFP_NOFS;
if (!f2fs_encrypted_inode(inode) || !S_ISREG(inode->i_mode))
if (!f2fs_encrypted_file(inode))
return 0;
/* wait for GCed encrypted page writeback */
@ -1974,7 +1974,7 @@ repeat:
f2fs_wait_on_page_writeback(page, DATA, false);
/* wait for GCed encrypted page writeback */
if (f2fs_encrypted_inode(inode) && S_ISREG(inode->i_mode))
if (f2fs_encrypted_file(inode))
f2fs_wait_on_encrypted_page_writeback(sbi, blkaddr);
if (len == PAGE_SIZE || PageUptodate(page))

5
fs/f2fs/f2fs.h
View File

@ -2939,6 +2939,11 @@ static inline bool f2fs_encrypted_inode(struct inode *inode)
return file_is_encrypt(inode);
}
static inline bool f2fs_encrypted_file(struct inode *inode)
{
return f2fs_encrypted_inode(inode) && S_ISREG(inode->i_mode);
}
static inline void f2fs_set_encrypted_inode(struct inode *inode)
{
#ifdef CONFIG_F2FS_FS_ENCRYPTION

2
fs/f2fs/file.c
View File

@ -106,7 +106,7 @@ mapped:
f2fs_wait_on_page_writeback(page, DATA, false);
/* wait for GCed encrypted page writeback */
if (f2fs_encrypted_inode(inode) && S_ISREG(inode->i_mode))
if (f2fs_encrypted_file(inode))
f2fs_wait_on_encrypted_page_writeback(sbi, dn.data_blkaddr);
out_sem:

5
fs/f2fs/gc.c
View File

@ -831,8 +831,7 @@ next_step:
continue;
/* if encrypted inode, let's go phase 3 */
if (f2fs_encrypted_inode(inode) &&
S_ISREG(inode->i_mode)) {
if (f2fs_encrypted_file(inode)) {
add_gc_inode(gc_list, inode);
continue;
}
@ -873,7 +872,7 @@ next_step:
start_bidx = start_bidx_of_node(nofs, inode)
+ ofs_in_node;
if (f2fs_encrypted_inode(inode) && S_ISREG(inode->i_mode))
if (f2fs_encrypted_file(inode))
move_encrypted_block(inode, start_bidx, segno, off);
else
move_data_page(inode, start_bidx, gc_type, segno, off);

2
fs/f2fs/inline.c
View File

@ -25,7 +25,7 @@ bool f2fs_may_inline_data(struct inode *inode)
if (i_size_read(inode) > MAX_INLINE_DATA(inode))
return false;
if (f2fs_encrypted_inode(inode) && S_ISREG(inode->i_mode))
if (f2fs_encrypted_file(inode))
return false;
return true;