2021-07-11 08:54:58

by Dwaipayan Ray

Subject: [PATCH] fs:xfs: cleanup __FUNCTION__ usage

__FUNCTION__ exists only for backwards compatibility reasons
with old gcc versions. Replace it with __func__.

Signed-off-by: Dwaipayan Ray <[email protected]>
---
fs/xfs/xfs_icreate_item.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/xfs/xfs_icreate_item.c b/fs/xfs/xfs_icreate_item.c
index 9b3994b9c716..017904a34c02 100644
--- a/fs/xfs/xfs_icreate_item.c
+++ b/fs/xfs/xfs_icreate_item.c
@@ -201,7 +201,7 @@ xlog_recover_icreate_commit_pass2(
if (length != igeo->ialloc_blks &&
length != igeo->ialloc_min_blks) {
xfs_warn(log->l_mp,
- "%s: unsupported chunk length", __FUNCTION__);
+ "%s: unsupported chunk length", __func__);
return -EINVAL;
}

@@ -209,7 +209,7 @@ xlog_recover_icreate_commit_pass2(
if ((count >> mp->m_sb.sb_inopblog) != length) {
xfs_warn(log->l_mp,
"%s: inconsistent inode count and chunk length",
- __FUNCTION__);
+ __func__);
return -EINVAL;
}

--
2.28.0

2021-07-11 22:49:33

by Dave Chinner

Subject: Re: [PATCH] fs:xfs: cleanup __FUNCTION__ usage

On Sun, Jul 11, 2021 at 02:21:53PM +0530, Dwaipayan Ray wrote:
> __FUNCTION__ exists only for backwards compatibility reasons
> with old gcc versions. Replace it with __func__.
>
> Signed-off-by: Dwaipayan Ray <[email protected]>
> ---
> fs/xfs/xfs_icreate_item.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/xfs/xfs_icreate_item.c b/fs/xfs/xfs_icreate_item.c
> index 9b3994b9c716..017904a34c02 100644
> --- a/fs/xfs/xfs_icreate_item.c
> +++ b/fs/xfs/xfs_icreate_item.c
> @@ -201,7 +201,7 @@ xlog_recover_icreate_commit_pass2(
> if (length != igeo->ialloc_blks &&
> length != igeo->ialloc_min_blks) {
> xfs_warn(log->l_mp,
> - "%s: unsupported chunk length", __FUNCTION__);
> + "%s: unsupported chunk length", __func__);
> return -EINVAL;
> }
>
> @@ -209,7 +209,7 @@ xlog_recover_icreate_commit_pass2(
> if ((count >> mp->m_sb.sb_inopblog) != length) {
> xfs_warn(log->l_mp,
> "%s: inconsistent inode count and chunk length",
> - __FUNCTION__);
> + __func__);
> return -EINVAL;
> }

Looks good.

Reviewed-by: Dave Chinner <[email protected]>

For future reference, the subject only needs "xfs:", you can drop
the "fs:" prefix from it.

-Dave.
--
Dave Chinner
[email protected]

2021-07-15 00:44:29

by Darrick J. Wong

Subject: Re: [PATCH] fs:xfs: cleanup __FUNCTION__ usage

On Sun, Jul 11, 2021 at 02:21:53PM +0530, Dwaipayan Ray wrote:
> __FUNCTION__ exists only for backwards compatibility reasons
> with old gcc versions. Replace it with __func__.
>
> Signed-off-by: Dwaipayan Ray <[email protected]>

LGTM
Reviewed-by: Darrick J. Wong <[email protected]>

--D

> ---
> fs/xfs/xfs_icreate_item.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/xfs/xfs_icreate_item.c b/fs/xfs/xfs_icreate_item.c
> index 9b3994b9c716..017904a34c02 100644
> --- a/fs/xfs/xfs_icreate_item.c
> +++ b/fs/xfs/xfs_icreate_item.c
> @@ -201,7 +201,7 @@ xlog_recover_icreate_commit_pass2(
> if (length != igeo->ialloc_blks &&
> length != igeo->ialloc_min_blks) {
> xfs_warn(log->l_mp,
> - "%s: unsupported chunk length", __FUNCTION__);
> + "%s: unsupported chunk length", __func__);
> return -EINVAL;
> }
>
> @@ -209,7 +209,7 @@ xlog_recover_icreate_commit_pass2(
> if ((count >> mp->m_sb.sb_inopblog) != length) {
> xfs_warn(log->l_mp,
> "%s: inconsistent inode count and chunk length",
> - __FUNCTION__);
> + __func__);
> return -EINVAL;
> }
>
> --
> 2.28.0
>