[PATCH] f2fs: fix build warning for f2fs_has_inline_data()

[PATCH] f2fs: fix build warning for f2fs_has_inline_data()

[Haicheng Li]

This patch is to fix the issue reported by Fengguang Wu:
> Note: the f2fs/linux-3.4 HEAD 22a48d188024830d61365ce97a0a8a0bedd494a9 builds fine.
>       It only hurts bisectibility.
>
> All error/warnings:
>
>    In file included from fs/f2fs/data.c:22:0:
>    fs/f2fs/data.c: In function 'f2fs_direct_IO':
> >> fs/f2fs/f2fs.h:1302:12: error: inlining failed in call to
> >> always_inline 'f2fs_has_inline_data': function body not available
>     inline int f2fs_has_inline_data(struct inode *);
..snip..

Signed-off-by: Haicheng Li <haicheng.li@linux.intel.com>
Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Cc: Huajun Li <huajun.li@intel.com>
---
 fs/f2fs/f2fs.h   |    5 ++++-
 fs/f2fs/inline.c |    5 -----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 6991a28..e143ca1 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -1314,7 +1314,10 @@ extern const struct inode_operations f2fs_special_inode_operations;
 /*
  * inline.c
  */
-inline int f2fs_has_inline_data(struct inode *);
+static inline int f2fs_has_inline_data(struct inode *inode)
+{
+	return is_inode_flag_set(F2FS_I(inode), FI_INLINE_DATA);
+}
 bool f2fs_may_inline(struct inode *);
 int f2fs_read_inline_data(struct inode *, struct page *);
 int f2fs_convert_inline_data(struct inode *, pgoff_t);
diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index 0e940ce..bcc6f65 100644
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -13,11 +13,6 @@
 
 #include "f2fs.h"
 
-inline int f2fs_has_inline_data(struct inode *inode)
-{
-	return is_inode_flag_set(F2FS_I(inode), FI_INLINE_DATA);
-}
-
 bool f2fs_may_inline(struct inode *inode)
 {
 	struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);
-- 
1.7.9.5

Re: [PATCH] f2fs: fix build warning for f2fs_has_inline_data()

[Jaegeuk Kim]

Hi,

Could you refer the following patch that I sent?

Re: [PATCH 5/6] f2fs: add the number of inline_data files to status info

Thanks,

2013-12-27 (금), 14:45 +0800, Haicheng Li:
> This patch is to fix the issue reported by Fengguang Wu:
> > Note: the f2fs/linux-3.4 HEAD 22a48d188024830d61365ce97a0a8a0bedd494a9 builds fine.
> >       It only hurts bisectibility.
> >
> > All error/warnings:
> >
> >    In file included from fs/f2fs/data.c:22:0:
> >    fs/f2fs/data.c: In function 'f2fs_direct_IO':
> > >> fs/f2fs/f2fs.h:1302:12: error: inlining failed in call to
> > >> always_inline 'f2fs_has_inline_data': function body not available
> >     inline int f2fs_has_inline_data(struct inode *);
> ..snip..
> 
> Signed-off-by: Haicheng Li <haicheng.li@linux.intel.com>
> Reported-by: Fengguang Wu <fengguang.wu@intel.com>
> Cc: Huajun Li <huajun.li@intel.com>
> ---
>  fs/f2fs/f2fs.h   |    5 ++++-
>  fs/f2fs/inline.c |    5 -----
>  2 files changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
> index 6991a28..e143ca1 100644
> --- a/fs/f2fs/f2fs.h
> +++ b/fs/f2fs/f2fs.h
> @@ -1314,7 +1314,10 @@ extern const struct inode_operations f2fs_special_inode_operations;
>  /*
>   * inline.c
>   */
> -inline int f2fs_has_inline_data(struct inode *);
> +static inline int f2fs_has_inline_data(struct inode *inode)
> +{
> +	return is_inode_flag_set(F2FS_I(inode), FI_INLINE_DATA);
> +}
>  bool f2fs_may_inline(struct inode *);
>  int f2fs_read_inline_data(struct inode *, struct page *);
>  int f2fs_convert_inline_data(struct inode *, pgoff_t);
> diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
> index 0e940ce..bcc6f65 100644
> --- a/fs/f2fs/inline.c
> +++ b/fs/f2fs/inline.c
> @@ -13,11 +13,6 @@
>  
>  #include "f2fs.h"
>  
> -inline int f2fs_has_inline_data(struct inode *inode)
> -{
> -	return is_inode_flag_set(F2FS_I(inode), FI_INLINE_DATA);
> -}
> -
>  bool f2fs_may_inline(struct inode *inode)
>  {
>  	struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb);

-- 
Jaegeuk Kim
Samsung



------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

Re: [PATCH] f2fs: fix build warning for f2fs_has_inline_data()

[Haicheng Li]

On Fri, Dec 27, 2013 at 06:22:03PM +0900, Jaegeuk Kim wrote:
> Hi,
> 
> Could you refer the following patch that I sent?
> 
> Re: [PATCH 5/6] f2fs: add the number of inline_data files to status info

yes, your patch should have fixed it. thanks.