xfs
[Top] [All Lists]

[PATCH] xfsprogs: fix compile error when libxfs header used in C++ code

To: Eric Sandeen <sandeen@xxxxxxxxxxx>
Subject: [PATCH] xfsprogs: fix compile error when libxfs header used in C++ code
From: Roger Willcocks <roger@xxxxxxxxxxxxxxxx>
Date: Mon, 12 May 2014 18:52:28 +0100
Cc: Roger Willcocks <roger@xxxxxxxxxxxxxxxx>, xfs@xxxxxxxxxxx
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <5370E964.50805@xxxxxxxxxxx>
References: <1399908138.4857.28.camel@xxxxxxxxxxxxxxxxxxxxxxxx> <5370E964.50805@xxxxxxxxxxx>
xfs_ialloc.h:102: error: expected ‘,’ or ‘...’ before ‘delete’

Simple parameter rename, no changes to behaviour.

Signed-off-by: Roger Willcocks <roger@xxxxxxxxxxxxxxxx>
---
 include/xfs_ialloc.h |    2 +-
 libxfs/xfs_ialloc.c  |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/xfs_ialloc.h b/include/xfs_ialloc.h
index a8f76a5..c8ac0a4 100644
--- a/include/xfs_ialloc.h
+++ b/include/xfs_ialloc.h
@@ -89,7 +89,7 @@ xfs_difree(
        struct xfs_trans *tp,           /* transaction pointer */
        xfs_ino_t       inode,          /* inode to be freed */
        struct xfs_bmap_free *flist,    /* extents to free */
-       int             *delete,        /* set if inode cluster was deleted */
+       int             *deleted,       /* set if inode cluster was deleted */
        xfs_ino_t       *first_ino);    /* first inode in deleted cluster */
 
 /*
diff --git a/libxfs/xfs_ialloc.c b/libxfs/xfs_ialloc.c
index c19d84a..1dabb6c 100644
--- a/libxfs/xfs_ialloc.c
+++ b/libxfs/xfs_ialloc.c
@@ -1080,7 +1080,7 @@ xfs_difree(
        xfs_trans_t     *tp,            /* transaction pointer */
        xfs_ino_t       inode,          /* inode to be freed */
        xfs_bmap_free_t *flist,         /* extents to free */
-       int             *delete,        /* set if inode cluster was deleted */
+       int             *deleted,       /* set if inode cluster was deleted */
        xfs_ino_t       *first_ino)     /* first inode in deleted cluster */
 {
        /* REFERENCED */
@@ -1180,7 +1180,7 @@ xfs_difree(
        if (!(mp->m_flags & XFS_MOUNT_IKEEP) &&
            (rec.ir_freecount == XFS_IALLOC_INODES(mp))) {
 
-               *delete = 1;
+               *deleted = 1;
                *first_ino = XFS_AGINO_TO_INO(mp, agno, rec.ir_startino);
 
                /*
@@ -1208,7 +1208,7 @@ xfs_difree(
                                agno, XFS_INO_TO_AGBNO(mp,rec.ir_startino)),
                                XFS_IALLOC_BLOCKS(mp), flist, mp);
        } else {
-               *delete = 0;
+               *deleted = 0;
 
                error = xfs_inobt_update(cur, &rec);
                if (error) {
-- 
1.7.1


<Prev in Thread] Current Thread [Next in Thread>