Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f294e1b authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: make more close to v4.13-rc1 



Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent bb2d1199

fs/f2fs/dir.c

+2 −2
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ out: 
 * Entry is guaranteed to be valid.

 */

struct f2fs_dir_entry *f2fs_find_entry(struct inode *dir,

			struct qstr *child, struct page **res_page)

			const struct qstr *child, struct page **res_page)

{

	struct f2fs_dir_entry *de = NULL;

	struct fscrypt_name fname;
@@ -276,7 +276,7 @@ struct f2fs_dir_entry *f2fs_parent_dir(struct inode *dir, struct page **p) 
	return f2fs_find_entry(dir, &dotdot, p);

}



ino_t f2fs_inode_by_name(struct inode *dir, struct qstr *qstr,

ino_t f2fs_inode_by_name(struct inode *dir, const struct qstr *qstr,

							struct page **page)

{

	ino_t res = 0;

fs/f2fs/f2fs.h

+7 −8
Original line number Diff line number Diff line
@@ -2238,13 +2238,11 @@ static inline bool is_dot_dotdot(const struct qstr *str) 


static inline bool f2fs_may_extent_tree(struct inode *inode)

{

	mode_t mode = inode->i_mode;



	if (!test_opt(F2FS_I_SB(inode), EXTENT_CACHE) ||

			is_inode_flag_set(inode, FI_NO_EXTENT))

		return false;



	return S_ISREG(mode);

	return S_ISREG(inode->i_mode);

}



static inline void *f2fs_kmalloc(struct f2fs_sb_info *sbi,
@@ -2259,7 +2257,7 @@ static inline void *f2fs_kmalloc(struct f2fs_sb_info *sbi, 
	return kmalloc(size, flags);

}



static inline void *f2fs_kvmalloc(size_t size, gfp_t flags)

static inline void *kvmalloc(size_t size, gfp_t flags)

{

	void *ret;
@@ -2269,7 +2267,7 @@ static inline void *f2fs_kvmalloc(size_t size, gfp_t flags) 
	return ret;

}



static inline void *f2fs_kvzalloc(size_t size, gfp_t flags)

static inline void *kvzalloc(size_t size, gfp_t flags)

{

	void *ret;
@@ -2338,9 +2336,9 @@ void f2fs_drop_nlink(struct inode *dir, struct inode *inode); 
struct f2fs_dir_entry *__f2fs_find_entry(struct inode *dir,

			struct fscrypt_name *fname, struct page **res_page);

struct f2fs_dir_entry *f2fs_find_entry(struct inode *dir,

			struct qstr *child, struct page **res_page);

			const struct qstr *child, struct page **res_page);

struct f2fs_dir_entry *f2fs_parent_dir(struct inode *dir, struct page **p);

ino_t f2fs_inode_by_name(struct inode *dir, struct qstr *qstr,

ino_t f2fs_inode_by_name(struct inode *dir, const struct qstr *qstr,

			struct page **page);

void f2fs_set_link(struct inode *dir, struct f2fs_dir_entry *de,

			struct page *page, struct inode *inode);
@@ -2916,11 +2914,12 @@ static inline void set_opt_mode(struct f2fs_sb_info *sbi, unsigned int mt) 
static inline bool f2fs_may_encrypt(struct inode *inode)

{

#ifdef CONFIG_F2FS_FS_ENCRYPTION

	mode_t mode = inode->i_mode;

	umode_t mode = inode->i_mode;



	return (S_ISREG(mode) || S_ISDIR(mode) || S_ISLNK(mode));

#else

	return 0;

#endif

}



#endif

fs/f2fs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -1045,11 +1045,11 @@ static int __exchange_data_block(struct inode *src_inode, 
	while (len) {

		olen = min((pgoff_t)4 * ADDRS_PER_BLOCK, len);



		src_blkaddr = f2fs_kvzalloc(sizeof(block_t) * olen, GFP_KERNEL);

		src_blkaddr = kvzalloc(sizeof(block_t) * olen, GFP_KERNEL);

		if (!src_blkaddr)

			return -ENOMEM;



		do_replace = f2fs_kvzalloc(sizeof(int) * olen, GFP_KERNEL);

		do_replace = kvzalloc(sizeof(int) * olen, GFP_KERNEL);

		if (!do_replace) {

			kvfree(src_blkaddr);

			return -ENOMEM;

fs/f2fs/namei.c

+2 −2
Original line number Diff line number Diff line
@@ -979,7 +979,7 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry, 
	file_lost_pino(old_inode);

	up_write(&F2FS_I(old_inode)->i_sem);



	old_dir->i_ctime = CURRENT_TIME;

	old_dir->i_ctime = current_time(old_dir);

	if (old_nlink) {

		down_write(&F2FS_I(old_dir)->i_sem);

		f2fs_i_links_write(old_dir, old_nlink > 0);
@@ -994,7 +994,7 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry, 
	file_lost_pino(new_inode);

	up_write(&F2FS_I(new_inode)->i_sem);



	new_dir->i_ctime = CURRENT_TIME;

	new_dir->i_ctime = current_time(new_dir);

	if (new_nlink) {

		down_write(&F2FS_I(new_dir)->i_sem);

		f2fs_i_links_write(new_dir, new_nlink > 0);

fs/f2fs/node.c

+3 −3
Original line number Diff line number Diff line
@@ -2670,17 +2670,17 @@ static int init_free_nid_cache(struct f2fs_sb_info *sbi) 
{

	struct f2fs_nm_info *nm_i = NM_I(sbi);



	nm_i->free_nid_bitmap = f2fs_kvzalloc(nm_i->nat_blocks *

	nm_i->free_nid_bitmap = kvzalloc(nm_i->nat_blocks *

					NAT_ENTRY_BITMAP_SIZE, GFP_KERNEL);

	if (!nm_i->free_nid_bitmap)

		return -ENOMEM;



	nm_i->nat_block_bitmap = f2fs_kvzalloc(nm_i->nat_blocks / 8,

	nm_i->nat_block_bitmap = kvzalloc(nm_i->nat_blocks / 8,

								GFP_KERNEL);

	if (!nm_i->nat_block_bitmap)

		return -ENOMEM;



	nm_i->free_nid_count = f2fs_kvzalloc(nm_i->nat_blocks *

	nm_i->free_nid_count = kvzalloc(nm_i->nat_blocks *

					sizeof(unsigned short), GFP_KERNEL);

	if (!nm_i->free_nid_count)

		return -ENOMEM;