Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
- index 5d32928dde5d..9c6388253c9d 100644
- --- a/fs/f2fs/f2fs.h
- +++ b/fs/f2fs/f2fs.h
- @@ -2765,23 +2765,6 @@ static inline bool f2fs_may_extent_tree(struct inode *inode)
- return S_ISREG(inode->i_mode);
- }
- -static inline void *f2fs_kmalloc(struct f2fs_sb_info *sbi,
- - size_t size, gfp_t flags)
- -{
- - void *ret;
- -
- - if (time_to_inject(sbi, FAULT_KMALLOC)) {
- - f2fs_show_injection_info(FAULT_KMALLOC);
- - return NULL;
- - }
- -
- - ret = kmalloc(size, flags);
- - if (ret)
- - return ret;
- -
- - return kvmalloc(size, flags);
- -}
- -
- static inline int wbc_to_write_flags(struct writeback_control *wbc)
- {
- if (wbc->sync_mode == WB_SYNC_ALL)
- @@ -2792,28 +2775,10 @@ static inline int wbc_to_write_flags(struct writeback_control *wbc)
- return 0;
- }
- -static inline void *f2fs_kzalloc(struct f2fs_sb_info *sbi,
- - size_t size, gfp_t flags)
- -{
- - return f2fs_kmalloc(sbi, size, flags | __GFP_ZERO);
- -}
- -
- -static inline void *f2fs_kvmalloc(struct f2fs_sb_info *sbi,
- - size_t size, gfp_t flags)
- -{
- - if (time_to_inject(sbi, FAULT_KVMALLOC)) {
- - f2fs_show_injection_info(FAULT_KVMALLOC);
- - return NULL;
- - }
- -
- - return kvmalloc(size, flags);
- -}
- -
- -static inline void *f2fs_kvzalloc(struct f2fs_sb_info *sbi,
- - size_t size, gfp_t flags)
- -{
- - return f2fs_kvmalloc(sbi, size, flags | __GFP_ZERO);
- -}
- +#define f2fs_kmalloc(sbi, size, flags) kmalloc(size, flags | GFP_KERNEL)
- +#define f2fs_kzalloc(sbi, size, flags) kmalloc(size, flags | GFP_KERNEL | __GFP_ZERO)
- +#define f2fs_kvmalloc(sbi, size, flags) kvmalloc(size, flags | GFP_KERNEL)
- +#define f2fs_kvzalloc(sbi, size, flags) kvmalloc(size, flags | GFP_KERNEL | __GFP_ZERO)
- static inline int get_extra_isize(struct inode *inode)
- {
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement