xfsprogs: build fixes for 4.19.0-rc0
cover xfsprogs: build fixes for 4.19.0-rc0
Hi Eric,
these are fixes for the build issues I just hit after updating my source tree to the for-next branch.
-Dave.
PATCH 1/2 xfsprogs: document changes for 4.19.0-rc0
From: Dave Chinner <[email protected]>
Because 'make deb' breaks without them.
Signed-off-by Dave Chinner <[email protected]>
--- debian/changelog | 7 +++++++ doc/CHANGES | 7 +++++++ 2 files changed, 14 insertions(+)
debian/changelog +7 -0
@@ -1,3 +1,10 @@ +xfsprogs (4.19.0-rc0-1) unstable; urgency=low + + * New upstream pre-release + * Merge libxfs changes from kernel-4.19 + + -- Nathan Scott <[email protected]> Wed, 10 Oct 2018 17:52:48 +1100 + xfsprogs (4.18.0-1) unstable; urgency=low * New upstream release
doc/CHANGES +7 -0
@@ -1,3 +1,10 @@ +xfsprogs-4.18.0-rc0 (10 Oct 2018) + - Majority of 4.18 libxfs changes merged from kernel + - Big sparse static checker cleanup (Eric Sandeen) + - mkfs.xfs discard fixes (Jan Tulak) + - xfs_io readv/writev cleanup (Zorro Lang) + - libxfs transaction commit error checking (Darrick Wong) + xfsprogs-4.18.0 (24 Aug 2018) - Tweak SPDX license in xfs_cksum.h (Darrick Wong)
Signature · 1 line
2.17.0
Re: [PATCH 1/2] xfsprogs: document changes for 4.19.0-rc0
Quoted 5 lines · Dave Chinner
From: Dave Chinner <[email protected]>
Because 'make deb' breaks without them.
Signed-off-by Dave Chinner <[email protected]>
Ugh, sorry about that, still not used to build systems that break on unchangelogged git tags ...
(that is the trigger, right? the tag?)
Reviewed-by Eric Sandeen <[email protected]>
Quoted 36 lines
--- debian/changelog | 7 +++++++ doc/CHANGES | 7 +++++++ 2 files changed, 14 insertions(+)debian/changelog +7
-0@@ -1,3 +1,10 @@ +xfsprogs (4.19.0-rc0-1) unstable; urgency=low + + * New upstream pre-release + * Merge libxfs changes from kernel-4.19 + + -- Nathan Scott <[email protected]> Wed, 10 Oct 2018 17:52:48 +1100 + xfsprogs (4.18.0-1) unstable; urgency=low * New upstream releasedoc/CHANGES +7
-0@@ -1,3 +1,10 @@ +xfsprogs-4.18.0-rc0 (10 Oct 2018) + - Majority of 4.18 libxfs changes merged from kernel + - Big sparse static checker cleanup (Eric Sandeen) + - mkfs.xfs discard fixes (Jan Tulak) + - xfs_io readv/writev cleanup (Zorro Lang) + - libxfs transaction commit error checking (Darrick Wong) + xfsprogs-4.18.0 (24 Aug 2018) - Tweak SPDX license in xfs_cksum.h (Darrick Wong)
Re: [PATCH 1/2] xfsprogs: document changes for 4.19.0-rc0
Quoted 11 lines · Eric Sandeen
Quoted 5 lines · Dave Chinner
From: Dave Chinner <[email protected]>
Because 'make deb' breaks without them.
Signed-off-by Dave Chinner <[email protected]>Ugh, sorry about that, still not used to build systems that break on unchangelogged git tags ...
(that is the trigger, right? the tag?)
No, it has nothing to do with git. The trigger is the package version set in VERSION and/or configure.ac not matching the documentation, which means it is in inconsistent state....
Cheers,
Dave.
Signature · 2 lines
Dave Chinner [email protected]
Re: [PATCH 1/2] xfsprogs: document changes for 4.19.0-rc0
In reply to Dave ChinnerQuoted 30 lines · Dave Chinner
From: Dave Chinner <[email protected]>
Because 'make deb' breaks without them.
Signed-off-by Dave Chinner <[email protected]>--- debian/changelog | 7 +++++++ doc/CHANGES | 7 +++++++ 2 files changed, 14 insertions(+)debian/changelog +7
-0@@ -1,3 +1,10 @@ +xfsprogs (4.19.0-rc0-1) unstable; urgency=low + + * New upstream pre-release + * Merge libxfs changes from kernel-4.19 + + -- Nathan Scott <[email protected]> Wed, 10 Oct 2018 17:52:48 +1100 + xfsprogs (4.18.0-1) unstable; urgency=low * New upstream releasedoc/CHANGES +0
-0
doc/CHANGES line 1
Quoted 1 line
doc/CHANGES +1
-0@@ -1,3 +1,10 @@ +xfsprogs-4.18.0-rc0 (10 Oct 2018)
4.19-rc0, right?
--D
Quoted 12 lines
doc/CHANGES +6
-0+ - Majority of 4.18 libxfs changes merged from kernel + - Big sparse static checker cleanup (Eric Sandeen) + - mkfs.xfs discard fixes (Jan Tulak) + - xfs_io readv/writev cleanup (Zorro Lang) + - libxfs transaction commit error checking (Darrick Wong) + xfsprogs-4.18.0 (24 Aug 2018) - Tweak SPDX license in xfs_cksum.h (Darrick Wong)Signature · 1 line
2.17.0
PATCH 2/2 xfsprogs: remove unused functions
In reply to Dave ChinnerFrom: Dave Chinner <[email protected]>
Clean up build warnings about defined by not used functions by removing them.
Signed-off-by Dave Chinner <[email protected]>
--- libxfs/rdwr.c | 8 ------- libxfs/util.c | 63 -------------------------------------------------- repair/btree.c | 23 ------------------ 3 files changed, 94 deletions(-)
libxfs/rdwr.c +0 -8
@@ -544,14 +544,6 @@ libxfs_bcompare(struct cache_node *node, cache_key_t key)return CACHE_MISS ; } -static void -libxfs_bprint (xfs_buf_t *bp) -{ -fprintf (stderr,"Buffer %p blkno=%llu bytes=%u flags=0x%x count=%u\n" , - bp, (unsigned long long )bp->b_bn, (unsigned )bp->b_bcount, - bp->b_flags, bp->b_node.cn_count); -} -static void __initbuf (xfs_buf_t *bp,struct xfs_buftarg *btp,xfs_daddr_t bno,unsigned int bytes)
libxfs/util.c +0 -63
69 lines not on this page · raw message
repair/btree.c +0 -23
@@ -444,29 +444,6 @@ btree_lookup_prev(return value; } -static void * -btree_uncached_lookup ( -struct btree_root *root, -unsigned long key) -{ -/* cursor-less (ie. uncached) lookup */ -int height = root->height -1 ; -struct btree_node *node = root->root_node; -int i; -int key_found =0 ; - -while (height >=0 ) { -for (i =0 ; i < node->num_keys; i++) -if (node->keys[i] >= key) { - key_found = node->keys[i] == key; -break ; - } - node = node->ptrs[i]; - height--; - } -return key_found ? node :NULL ; -} -/* Update functions */ static inline void
Signature · 1 line
2.17.0
Re: [PATCH 2/2] xfsprogs: remove unused functions
Quoted 3 lines · Dave Chinner
From: Dave Chinner <[email protected]>
Clean up build warnings about defined by not used functions by
defined but not used
Quoted 1 line
removing them.
otherwise looks good
Reviewed-by Carlos Maiolino <[email protected]>
Quoted 138 lines
Signed-off-by Dave Chinner <[email protected]>--- libxfs/rdwr.c | 8 ------- libxfs/util.c | 63 -------------------------------------------------- repair/btree.c | 23 ------------------ 3 files changed, 94 deletions(-)libxfs/rdwr.c +0
-8@@ -544,14 +544,6 @@ libxfs_bcompare(struct cache_node *node, cache_key_t key)return CACHE_MISS ; } -static void -libxfs_bprint (xfs_buf_t *bp) -{ -fprintf (stderr,"Buffer %p blkno=%llu bytes=%u flags=0x%x count=%u\n" , - bp, (unsigned long long )bp->b_bn, (unsigned )bp->b_bcount, - bp->b_flags, bp->b_node.cn_count); -} -static void __initbuf (xfs_buf_t *bp,struct xfs_buftarg *btp,xfs_daddr_t bno,unsigned int bytes)libxfs/util.c +0
-63@@ -380,69 +380,6 @@ libxfs_ialloc(return 0 ; } -static void -libxfs_iprint ( -xfs_inode_t *ip) -{ -struct xfs_icdinode *dip; -xfs_extnum_t i =0 ; -struct xfs_ifork *ifp;/* inode fork pointer */ -struct xfs_iext_cursor icur; -xfs_bmbt_irec_t rec; - -printf ("Inode %lx\n" , (unsigned long )ip); -printf (" i_ino %llx\n" , (unsigned long long )ip->i_ino); - -if (ip->i_df.if_flags &XFS_IFEXTENTS ) -printf ("EXTENTS " ); -printf ("\n" ); -printf (" i_df.if_bytes %d\n" , ip->i_df.if_bytes); -printf (" i_df.if_u1.if_root/if_data %lx\n" , - (unsigned long )ip->i_df.if_u1.if_root); -if (ip->i_df.if_flags &XFS_IFEXTENTS ) { - ifp =XFS_IFORK_PTR (ip,XFS_DATA_FORK ); -for_each_xfs_iext (ifp, &icur, &rec) { -printf ("\t%d: startoff %llu, startblock 0x%llx," -" blockcount %llu, state %d\n" , - i, (unsigned long long )rec.br_startoff, - (unsigned long long )rec.br_startblock, - (unsigned long long )rec.br_blockcount, - (int )rec.br_state); - i++; - } - } -printf (" i_df.if_broot %lx\n" , (unsigned long )ip->i_df.if_broot); -printf (" i_df.if_broot_bytes %x\n" , ip->i_df.if_broot_bytes); - - dip = &ip->i_d; -printf ("\nOn disk portion\n" ); -printf (" di_mode %o\n" ,VFS_I (ip)->i_mode); -printf (" di_version %x\n" , (uint )dip->di_version); -switch (ip->i_d.di_format) { -case XFS_DINODE_FMT_LOCAL : -printf (" Inline inode\n" ); -break ; -case XFS_DINODE_FMT_EXTENTS : -printf (" Extents inode\n" ); -break ; -case XFS_DINODE_FMT_BTREE : -printf (" B-tree inode\n" ); -break ; -default : -printf (" Other inode\n" ); -break ; - } -printf (" di_nlink %x\n" ,VFS_I (ip)->i_nlink); -printf (" di_uid %d\n" , dip->di_uid); -printf (" di_gid %d\n" , dip->di_gid); -printf (" di_nextents %d\n" , dip->di_nextents); -printf (" di_size %llu\n" , (unsigned long long )dip->di_size); -printf (" di_gen %x\n" ,VFS_I (ip)->i_generation); -printf (" di_extsize %d\n" , dip->di_extsize); -printf (" di_flags %x\n" , dip->di_flags); -printf (" di_nblocks %llu\n" , (unsigned long long )dip->di_nblocks); -} -/* * Writes a modified inode's changes out to the inode's on disk home. * Originally based on xfs_iflush_int() from xfs_inode.c in the kernel. repair/btree.c +0
-23@@ -444,29 +444,6 @@ btree_lookup_prev(return value; } -static void * -btree_uncached_lookup ( -struct btree_root *root, -unsigned long key) -{ -/* cursor-less (ie. uncached) lookup */ -int height = root->height -1 ; -struct btree_node *node = root->root_node; -int i; -int key_found =0 ; - -while (height >=0 ) { -for (i =0 ; i < node->num_keys; i++) -if (node->keys[i] >= key) { - key_found = node->keys[i] == key; -break ; - } - node = node->ptrs[i]; - height--; - } -return key_found ? node :NULL ; -} -/* Update functions */ static inline voidSignature · 1 line
2.17.0
Signature · 1 line
Carlos
Re: [PATCH 2/2] xfsprogs: remove unused functions
In reply to Dave ChinnerQuoted 6 lines · Dave Chinner
From: Dave Chinner <[email protected]>
Clean up build warnings about defined by not used functions by removing them.
Signed-off-by Dave Chinner <[email protected]>
Ok - Yeah, I knew these were there and was going to clean it up before release. I was going to ask if anyone ever used these for debugging and
see about just using an unused attribute rather than removing them.
If nobody asks for that, I'll merge this.
Thanks,
Reviewed-by Eric Sandeen <[email protected]>
Quoted 134 lines
--- libxfs/rdwr.c | 8 ------- libxfs/util.c | 63 -------------------------------------------------- repair/btree.c | 23 ------------------ 3 files changed, 94 deletions(-)libxfs/rdwr.c +0
-8@@ -544,14 +544,6 @@ libxfs_bcompare(struct cache_node *node, cache_key_t key)return CACHE_MISS ; } -static void -libxfs_bprint (xfs_buf_t *bp) -{ -fprintf (stderr,"Buffer %p blkno=%llu bytes=%u flags=0x%x count=%u\n" , - bp, (unsigned long long )bp->b_bn, (unsigned )bp->b_bcount, - bp->b_flags, bp->b_node.cn_count); -} -static void __initbuf (xfs_buf_t *bp,struct xfs_buftarg *btp,xfs_daddr_t bno,unsigned int bytes)libxfs/util.c +0
-63@@ -380,69 +380,6 @@ libxfs_ialloc(return 0 ; } -static void -libxfs_iprint ( -xfs_inode_t *ip) -{ -struct xfs_icdinode *dip; -xfs_extnum_t i =0 ; -struct xfs_ifork *ifp;/* inode fork pointer */ -struct xfs_iext_cursor icur; -xfs_bmbt_irec_t rec; - -printf ("Inode %lx\n" , (unsigned long )ip); -printf (" i_ino %llx\n" , (unsigned long long )ip->i_ino); - -if (ip->i_df.if_flags &XFS_IFEXTENTS ) -printf ("EXTENTS " ); -printf ("\n" ); -printf (" i_df.if_bytes %d\n" , ip->i_df.if_bytes); -printf (" i_df.if_u1.if_root/if_data %lx\n" , - (unsigned long )ip->i_df.if_u1.if_root); -if (ip->i_df.if_flags &XFS_IFEXTENTS ) { - ifp =XFS_IFORK_PTR (ip,XFS_DATA_FORK ); -for_each_xfs_iext (ifp, &icur, &rec) { -printf ("\t%d: startoff %llu, startblock 0x%llx," -" blockcount %llu, state %d\n" , - i, (unsigned long long )rec.br_startoff, - (unsigned long long )rec.br_startblock, - (unsigned long long )rec.br_blockcount, - (int )rec.br_state); - i++; - } - } -printf (" i_df.if_broot %lx\n" , (unsigned long )ip->i_df.if_broot); -printf (" i_df.if_broot_bytes %x\n" , ip->i_df.if_broot_bytes); - - dip = &ip->i_d; -printf ("\nOn disk portion\n" ); -printf (" di_mode %o\n" ,VFS_I (ip)->i_mode); -printf (" di_version %x\n" , (uint )dip->di_version); -switch (ip->i_d.di_format) { -case XFS_DINODE_FMT_LOCAL : -printf (" Inline inode\n" ); -break ; -case XFS_DINODE_FMT_EXTENTS : -printf (" Extents inode\n" ); -break ; -case XFS_DINODE_FMT_BTREE : -printf (" B-tree inode\n" ); -break ; -default : -printf (" Other inode\n" ); -break ; - } -printf (" di_nlink %x\n" ,VFS_I (ip)->i_nlink); -printf (" di_uid %d\n" , dip->di_uid); -printf (" di_gid %d\n" , dip->di_gid); -printf (" di_nextents %d\n" , dip->di_nextents); -printf (" di_size %llu\n" , (unsigned long long )dip->di_size); -printf (" di_gen %x\n" ,VFS_I (ip)->i_generation); -printf (" di_extsize %d\n" , dip->di_extsize); -printf (" di_flags %x\n" , dip->di_flags); -printf (" di_nblocks %llu\n" , (unsigned long long )dip->di_nblocks); -} -/* * Writes a modified inode's changes out to the inode's on disk home. * Originally based on xfs_iflush_int() from xfs_inode.c in the kernel. repair/btree.c +0
-23@@ -444,29 +444,6 @@ btree_lookup_prev(return value; } -static void * -btree_uncached_lookup ( -struct btree_root *root, -unsigned long key) -{ -/* cursor-less (ie. uncached) lookup */ -int height = root->height -1 ; -struct btree_node *node = root->root_node; -int i; -int key_found =0 ; - -while (height >=0 ) { -for (i =0 ; i < node->num_keys; i++) -if (node->keys[i] >= key) { - key_found = node->keys[i] == key; -break ; - } - node = node->ptrs[i]; - height--; - } -return key_found ? node :NULL ; -} -/* Update functions */ static inline void
Re: [PATCH 2/2] xfsprogs: remove unused functions
In reply to Dave ChinnerQuoted 6 lines · Dave Chinner
From: Dave Chinner <[email protected]>
Clean up build warnings about defined by not used functions by removing them.
Signed-off-by Dave Chinner <[email protected]>
Fine with me; if anyone wants them in the future they can put them back.
Reviewed-by Darrick J. Wong <[email protected]>
--D
Quoted 136 lines
--- libxfs/rdwr.c | 8 ------- libxfs/util.c | 63 -------------------------------------------------- repair/btree.c | 23 ------------------ 3 files changed, 94 deletions(-)libxfs/rdwr.c +0
-8@@ -544,14 +544,6 @@ libxfs_bcompare(struct cache_node *node, cache_key_t key)return CACHE_MISS ; } -static void -libxfs_bprint (xfs_buf_t *bp) -{ -fprintf (stderr,"Buffer %p blkno=%llu bytes=%u flags=0x%x count=%u\n" , - bp, (unsigned long long )bp->b_bn, (unsigned )bp->b_bcount, - bp->b_flags, bp->b_node.cn_count); -} -static void __initbuf (xfs_buf_t *bp,struct xfs_buftarg *btp,xfs_daddr_t bno,unsigned int bytes)libxfs/util.c +0
-63@@ -380,69 +380,6 @@ libxfs_ialloc(return 0 ; } -static void -libxfs_iprint ( -xfs_inode_t *ip) -{ -struct xfs_icdinode *dip; -xfs_extnum_t i =0 ; -struct xfs_ifork *ifp;/* inode fork pointer */ -struct xfs_iext_cursor icur; -xfs_bmbt_irec_t rec; - -printf ("Inode %lx\n" , (unsigned long )ip); -printf (" i_ino %llx\n" , (unsigned long long )ip->i_ino); - -if (ip->i_df.if_flags &XFS_IFEXTENTS ) -printf ("EXTENTS " ); -printf ("\n" ); -printf (" i_df.if_bytes %d\n" , ip->i_df.if_bytes); -printf (" i_df.if_u1.if_root/if_data %lx\n" , - (unsigned long )ip->i_df.if_u1.if_root); -if (ip->i_df.if_flags &XFS_IFEXTENTS ) { - ifp =XFS_IFORK_PTR (ip,XFS_DATA_FORK ); -for_each_xfs_iext (ifp, &icur, &rec) { -printf ("\t%d: startoff %llu, startblock 0x%llx," -" blockcount %llu, state %d\n" , - i, (unsigned long long )rec.br_startoff, - (unsigned long long )rec.br_startblock, - (unsigned long long )rec.br_blockcount, - (int )rec.br_state); - i++; - } - } -printf (" i_df.if_broot %lx\n" , (unsigned long )ip->i_df.if_broot); -printf (" i_df.if_broot_bytes %x\n" , ip->i_df.if_broot_bytes); - - dip = &ip->i_d; -printf ("\nOn disk portion\n" ); -printf (" di_mode %o\n" ,VFS_I (ip)->i_mode); -printf (" di_version %x\n" , (uint )dip->di_version); -switch (ip->i_d.di_format) { -case XFS_DINODE_FMT_LOCAL : -printf (" Inline inode\n" ); -break ; -case XFS_DINODE_FMT_EXTENTS : -printf (" Extents inode\n" ); -break ; -case XFS_DINODE_FMT_BTREE : -printf (" B-tree inode\n" ); -break ; -default : -printf (" Other inode\n" ); -break ; - } -printf (" di_nlink %x\n" ,VFS_I (ip)->i_nlink); -printf (" di_uid %d\n" , dip->di_uid); -printf (" di_gid %d\n" , dip->di_gid); -printf (" di_nextents %d\n" , dip->di_nextents); -printf (" di_size %llu\n" , (unsigned long long )dip->di_size); -printf (" di_gen %x\n" ,VFS_I (ip)->i_generation); -printf (" di_extsize %d\n" , dip->di_extsize); -printf (" di_flags %x\n" , dip->di_flags); -printf (" di_nblocks %llu\n" , (unsigned long long )dip->di_nblocks); -} -/* * Writes a modified inode's changes out to the inode's on disk home. * Originally based on xfs_iflush_int() from xfs_inode.c in the kernel. repair/btree.c +0
-23@@ -444,29 +444,6 @@ btree_lookup_prev(return value; } -static void * -btree_uncached_lookup ( -struct btree_root *root, -unsigned long key) -{ -/* cursor-less (ie. uncached) lookup */ -int height = root->height -1 ; -struct btree_node *node = root->root_node; -int i; -int key_found =0 ; - -while (height >=0 ) { -for (i =0 ; i < node->num_keys; i++) -if (node->keys[i] >= key) { - key_found = node->keys[i] == key; -break ; - } - node = node->ptrs[i]; - height--; - } -return key_found ? node :NULL ; -} -/* Update functions */ static inline voidSignature · 1 line
2.17.0