libxfs: remove stale xfs_trans_mod_sb() declaration
PATCH 1/1 libxfs: remove stale xfs_trans_mod_sb() declaration
The fa19604607c1 added xfs_trans.h which declares xfs_trans_mod_sb(), this function was already declared in xfs_platoform.h. They have conflicting type of the last 'delta' argument (stale long, newer int64_t from kernel's xfs_trans.h).
This breaks on systems with 32-bit long (e.g. i686) but works fine on 64-bit as these are basically the same definitions there.
./libxfs_api_defs.h:390:41: error: conflicting types for 'libxfs_trans_mod_sb'; have 'void(struct xfs_trans *, uint, long int)' {aka 'void(struct xfs_trans *, unsigned int, long int)'} 390 | #define xfs_trans_mod_sb libxfs_trans_mod_sb
| ^~~~~~~~~~~~~~~~~~~
xfs_platform.h:411:6: note: in expansion of macro 'xfs_trans_mod_sb'
411 | void xfs_trans_mod_sb(struct xfs_trans *, uint, long);
| ^~~~~~~~~~~~~~~~
./libxfs_api_defs.h:390:41: note: previous declaration of 'libxfs_trans_mod_sb' with type 'void(xfs_trans_t *, uint, int64_t)' {aka 'void(struct xfs_trans *, unsigned int, long long int)'} 390 | #define xfs_trans_mod_sb libxfs_trans_mod_sb
| ^~~~~~~~~~~~~~~~~~~
./xfs_trans.h:173:17: note: in expansion of macro 'xfs_trans_mod_sb'
173 | void xfs_trans_mod_sb(xfs_trans_t *, uint, int64_t);
| ^~~~~~~~~~~~~~~~
Fix by removing stale definition and updating declaration to int64_t.
--- libxfs/trans.c | 2 +- libxfs/xfs_platform.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-)
libxfs/trans.c +1 -1
@@ -845,7 +845,7 @@ voidlibxfs_trans_mod_sb ( xfs_trans_t *tp, uint field, - long delta) + int64_t delta) {switch (field) {case XFS_TRANS_SB_RES_FDBLOCKS :
libxfs/xfs_platform.h +0 -2
@@ -408,8 +408,6 @@ int libxfs_mod_incore_sb(struct xfs_mount *, int, int64_t, int);/* percpu counters in mp are #defined to the superblock sb_ counters */ #define xfs_reinit_percpu_counters (mp) -void xfs_trans_mod_sb (struct xfs_trans *,uint ,long ); -void xfs_verifier_error (struct xfs_buf *bp,int error,xfs_failaddr_t failaddr); void xfs_inode_verifier_error(struct xfs_inode *ip, int error,
Signature · 1 line
2.54.0
Looks good to me and fixes the issue.
Thank you very much!
Looks good: