Advertisement
arter97

Untitled

Jul 9th, 2019
546
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 1.74 KB | None | 0 0
  1. diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
  2. index 5d32928dde5d..9c6388253c9d 100644
  3. --- a/fs/f2fs/f2fs.h
  4. +++ b/fs/f2fs/f2fs.h
  5. @@ -2765,23 +2765,6 @@ static inline bool f2fs_may_extent_tree(struct inode *inode)
  6.     return S_ISREG(inode->i_mode);
  7.  }
  8.  
  9. -static inline void *f2fs_kmalloc(struct f2fs_sb_info *sbi,
  10. -                   size_t size, gfp_t flags)
  11. -{
  12. -   void *ret;
  13. -
  14. -   if (time_to_inject(sbi, FAULT_KMALLOC)) {
  15. -       f2fs_show_injection_info(FAULT_KMALLOC);
  16. -       return NULL;
  17. -   }
  18. -
  19. -   ret = kmalloc(size, flags);
  20. -   if (ret)
  21. -       return ret;
  22. -
  23. -   return kvmalloc(size, flags);
  24. -}
  25. -
  26.  static inline int wbc_to_write_flags(struct writeback_control *wbc)
  27.  {
  28.     if (wbc->sync_mode == WB_SYNC_ALL)
  29. @@ -2792,28 +2775,10 @@ static inline int wbc_to_write_flags(struct writeback_control *wbc)
  30.     return 0;
  31.  }
  32.  
  33. -static inline void *f2fs_kzalloc(struct f2fs_sb_info *sbi,
  34. -                   size_t size, gfp_t flags)
  35. -{
  36. -   return f2fs_kmalloc(sbi, size, flags | __GFP_ZERO);
  37. -}
  38. -
  39. -static inline void *f2fs_kvmalloc(struct f2fs_sb_info *sbi,
  40. -                   size_t size, gfp_t flags)
  41. -{
  42. -   if (time_to_inject(sbi, FAULT_KVMALLOC)) {
  43. -       f2fs_show_injection_info(FAULT_KVMALLOC);
  44. -       return NULL;
  45. -   }
  46. -
  47. -   return kvmalloc(size, flags);
  48. -}
  49. -
  50. -static inline void *f2fs_kvzalloc(struct f2fs_sb_info *sbi,
  51. -                   size_t size, gfp_t flags)
  52. -{
  53. -   return f2fs_kvmalloc(sbi, size, flags | __GFP_ZERO);
  54. -}
  55. +#define f2fs_kmalloc(sbi, size, flags) kmalloc(size, flags | GFP_KERNEL)
  56. +#define f2fs_kzalloc(sbi, size, flags) kmalloc(size, flags | GFP_KERNEL | __GFP_ZERO)
  57. +#define f2fs_kvmalloc(sbi, size, flags) kvmalloc(size, flags | GFP_KERNEL)
  58. +#define f2fs_kvzalloc(sbi, size, flags) kvmalloc(size, flags | GFP_KERNEL | __GFP_ZERO)
  59.  
  60.  static inline int get_extra_isize(struct inode *inode)
  61.  {
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement