diff options
author | Roger Willcocks <roger@filmlight.ltd.uk> | 2014-05-19 18:52:21 -0400 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2014-05-19 18:52:21 -0400 |
commit | 376c2f3a5f0706868b08ccf043bf3532936a03b1 (patch) | |
tree | 57fa77e7ac020a1bef0cdb2b21b9627a13ad943b | |
parent | 8695d27ec34b19c58a0dc25bfcce3f2c6cf0699d (diff) |
xfs: fix compile error when libxfs header used in C++ code
xfs_ialloc.h:102: error: expected ',' or '...' before 'delete'
Simple parameter rename, no changes to behaviour.
Signed-off-by: Roger Willcocks <roger@filmlight.ltd.uk>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
-rw-r--r-- | fs/xfs/xfs_ialloc.c | 6 | ||||
-rw-r--r-- | fs/xfs/xfs_ialloc.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fs/xfs/xfs_ialloc.c b/fs/xfs/xfs_ialloc.c index 8f711db61a0c..b819263b7f2e 100644 --- a/fs/xfs/xfs_ialloc.c +++ b/fs/xfs/xfs_ialloc.c | |||
@@ -1109,7 +1109,7 @@ xfs_difree( | |||
1109 | xfs_trans_t *tp, /* transaction pointer */ | 1109 | xfs_trans_t *tp, /* transaction pointer */ |
1110 | xfs_ino_t inode, /* inode to be freed */ | 1110 | xfs_ino_t inode, /* inode to be freed */ |
1111 | xfs_bmap_free_t *flist, /* extents to free */ | 1111 | xfs_bmap_free_t *flist, /* extents to free */ |
1112 | int *delete, /* set if inode cluster was deleted */ | 1112 | int *deleted, /* set if inode cluster was deleted */ |
1113 | xfs_ino_t *first_ino) /* first inode in deleted cluster */ | 1113 | xfs_ino_t *first_ino) /* first inode in deleted cluster */ |
1114 | { | 1114 | { |
1115 | /* REFERENCED */ | 1115 | /* REFERENCED */ |
@@ -1209,7 +1209,7 @@ xfs_difree( | |||
1209 | if (!(mp->m_flags & XFS_MOUNT_IKEEP) && | 1209 | if (!(mp->m_flags & XFS_MOUNT_IKEEP) && |
1210 | (rec.ir_freecount == mp->m_ialloc_inos)) { | 1210 | (rec.ir_freecount == mp->m_ialloc_inos)) { |
1211 | 1211 | ||
1212 | *delete = 1; | 1212 | *deleted = 1; |
1213 | *first_ino = XFS_AGINO_TO_INO(mp, agno, rec.ir_startino); | 1213 | *first_ino = XFS_AGINO_TO_INO(mp, agno, rec.ir_startino); |
1214 | 1214 | ||
1215 | /* | 1215 | /* |
@@ -1237,7 +1237,7 @@ xfs_difree( | |||
1237 | XFS_AGINO_TO_AGBNO(mp, rec.ir_startino)), | 1237 | XFS_AGINO_TO_AGBNO(mp, rec.ir_startino)), |
1238 | mp->m_ialloc_blks, flist, mp); | 1238 | mp->m_ialloc_blks, flist, mp); |
1239 | } else { | 1239 | } else { |
1240 | *delete = 0; | 1240 | *deleted = 0; |
1241 | 1241 | ||
1242 | error = xfs_inobt_update(cur, &rec); | 1242 | error = xfs_inobt_update(cur, &rec); |
1243 | if (error) { | 1243 | if (error) { |
diff --git a/fs/xfs/xfs_ialloc.h b/fs/xfs/xfs_ialloc.h index 812365d17e67..95ad1c002d60 100644 --- a/fs/xfs/xfs_ialloc.h +++ b/fs/xfs/xfs_ialloc.h | |||
@@ -90,7 +90,7 @@ xfs_difree( | |||
90 | struct xfs_trans *tp, /* transaction pointer */ | 90 | struct xfs_trans *tp, /* transaction pointer */ |
91 | xfs_ino_t inode, /* inode to be freed */ | 91 | xfs_ino_t inode, /* inode to be freed */ |
92 | struct xfs_bmap_free *flist, /* extents to free */ | 92 | struct xfs_bmap_free *flist, /* extents to free */ |
93 | int *delete, /* set if inode cluster was deleted */ | 93 | int *deleted, /* set if inode cluster was deleted */ |
94 | xfs_ino_t *first_ino); /* first inode in deleted cluster */ | 94 | xfs_ino_t *first_ino); /* first inode in deleted cluster */ |
95 | 95 | ||
96 | /* | 96 | /* |