From 3891117c7489874d7b781d4e699747e0061f9055 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 05 2019 21:28:52 +0000 Subject: import xfsprogs-5.0.0-1.el8 --- diff --git a/.gitignore b/.gitignore index 52772e4..5bc0f06 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/xfsprogs-4.19.0.tar.xz +SOURCES/xfsprogs-5.0.0.tar.xz diff --git a/.xfsprogs.metadata b/.xfsprogs.metadata index 72adb91..fbd87e2 100644 --- a/.xfsprogs.metadata +++ b/.xfsprogs.metadata @@ -1 +1 @@ -e6aa93d892df76a1675755b88e9ac6b2793eb619 SOURCES/xfsprogs-4.19.0.tar.xz +1a3d7ce8ebf75e001463162e4a44c0f5bf0beab7 SOURCES/xfsprogs-5.0.0.tar.xz diff --git a/SOURCES/0001-xfs_repair-initialize-non-leaf-finobt-blocks-with-co.patch b/SOURCES/0001-xfs_repair-initialize-non-leaf-finobt-blocks-with-co.patch deleted file mode 100644 index 184a614..0000000 --- a/SOURCES/0001-xfs_repair-initialize-non-leaf-finobt-blocks-with-co.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 051dae5efb4fc7c1c47ccb72ff161241fb0815ee Mon Sep 17 00:00:00 2001 -From: Brian Foster -Date: Mon, 28 Jan 2019 16:05:16 -0600 -Subject: [PATCH] xfs_repair: initialize non-leaf finobt blocks with correct - magic - -The free inode btree construction code in xfs_repair has a bug where -any non-leaf nodes outside of the leftmost block at the associated -level in the tree are incorrectly initialized with the inobt magic -value. Update the prop_ino_cursor() path responsible for growing the -non-leaf portion of the inode btrees to use the btnum of the -specific tree being generated rather than the hardcoded inode btree -type. - -Signed-off-by: Brian Foster -Reported-by: Lucas Stach -Root-caused-by: Lucas Stach -Reviewed-by: Eric Sandeen -Reviewed-by: Dave Chinner -Signed-off-by: Eric Sandeen ---- - repair/phase5.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/repair/phase5.c b/repair/phase5.c -index 1bacfc7..e8f9f46 100644 ---- a/repair/phase5.c -+++ b/repair/phase5.c -@@ -983,7 +983,7 @@ init_ino_cursor(xfs_mount_t *mp, xfs_agnumber_t agno, bt_status_t *btree_curs, - - static void - prop_ino_cursor(xfs_mount_t *mp, xfs_agnumber_t agno, bt_status_t *btree_curs, -- xfs_agino_t startino, int level) -+ xfs_btnum_t btnum, xfs_agino_t startino, int level) - { - struct xfs_btree_block *bt_hdr; - xfs_inobt_key_t *bt_key; -@@ -1005,7 +1005,7 @@ prop_ino_cursor(xfs_mount_t *mp, xfs_agnumber_t agno, bt_status_t *btree_curs, - * first path up the left side of the tree - * where the agbno's are already set up - */ -- prop_ino_cursor(mp, agno, btree_curs, startino, level); -+ prop_ino_cursor(mp, agno, btree_curs, btnum, startino, level); - } - - if (be16_to_cpu(bt_hdr->bb_numrecs) == -@@ -1041,7 +1041,7 @@ prop_ino_cursor(xfs_mount_t *mp, xfs_agnumber_t agno, bt_status_t *btree_curs, - lptr->buf_p->b_ops = &xfs_inobt_buf_ops; - bt_hdr = XFS_BUF_TO_BLOCK(lptr->buf_p); - memset(bt_hdr, 0, mp->m_sb.sb_blocksize); -- libxfs_btree_init_block(mp, lptr->buf_p, XFS_BTNUM_INO, -+ libxfs_btree_init_block(mp, lptr->buf_p, btnum, - level, 0, agno, 0); - - bt_hdr->bb_u.s.bb_leftsib = cpu_to_be32(lptr->prev_agbno); -@@ -1049,7 +1049,7 @@ prop_ino_cursor(xfs_mount_t *mp, xfs_agnumber_t agno, bt_status_t *btree_curs, - /* - * propagate extent record for first extent in new block up - */ -- prop_ino_cursor(mp, agno, btree_curs, startino, level); -+ prop_ino_cursor(mp, agno, btree_curs, btnum, startino, level); - } - /* - * add inode info to current block -@@ -1201,7 +1201,7 @@ build_ino_tree(xfs_mount_t *mp, xfs_agnumber_t agno, - lptr->modulo--; - - if (lptr->num_recs_pb > 0) -- prop_ino_cursor(mp, agno, btree_curs, -+ prop_ino_cursor(mp, agno, btree_curs, btnum, - ino_rec->ino_startnum, 0); - - bt_rec = (xfs_inobt_rec_t *) --- -2.9.5 - diff --git a/SPECS/xfsprogs.spec b/SPECS/xfsprogs.spec index c81fc9f..f79ce56 100644 --- a/SPECS/xfsprogs.spec +++ b/SPECS/xfsprogs.spec @@ -1,7 +1,7 @@ Summary: Utilities for managing the XFS filesystem Name: xfsprogs -Version: 4.19.0 -Release: 2%{?dist} +Version: 5.0.0 +Release: 1%{?dist} License: GPL+ and LGPLv2+ Group: System Environment/Base URL: https://xfs.wiki.kernel.org @@ -18,7 +18,6 @@ Conflicts: xfsdump < 3.0.1 # reflink is not yet default upstream, but we enabled it as such Patch0: xfsprogs-4.17.0-reflink-default.patch -Patch1: 0001-xfs_repair-initialize-non-leaf-finobt-blocks-with-co.patch %description A set of commands to use the XFS filesystem, including mkfs.xfs. @@ -50,7 +49,6 @@ also want to install xfsprogs. %setup -q %patch0 -p1 -%patch1 -p1 %build export tagname=CC @@ -110,6 +108,16 @@ rm -rf $RPM_BUILD_ROOT/%{_mandir}/man8/xfs_scrub* %{_libdir}/*.so %changelog +* Tue May 21 2019 Eric Sandeen 5.0.0-1 +- New upstream version (#1712147) +- mkfs.xfs: validate extent size hint parameters (#1683007) +- mkfs.xfs: null-terminate symlinks created via protofile (#1640503) +- xfs_repair: allow '/' in attribute names (#1667354) +- xfs_info: allow device name as parameter (#1679840) +- xfs_quota: fix project inheritance flag handling (#1664105) +- xfs_metadump: handle symlinks correctly (#1693074) +- xfs_db: fix finobt record decoding with sparse inodes (#1690245) + * Mon Feb 04 2019 Eric Sandeen 4.19.0-2 - xfs_repair: initialize non-leaf finobt blocks with correct magic (#1670153) @@ -119,7 +127,7 @@ rm -rf $RPM_BUILD_ROOT/%{_mandir}/man8/xfs_scrub* - Fix xfs_db sign extension in agi freecount (#1640090) - Fix xfs_repair hang on large filesystem (#1630674) -* Mon Sep 25 2018 Eric Sandeen 4.18.0-3 +* Tue Sep 25 2018 Eric Sandeen 4.18.0-3 - Remove experimental xfs_scrub utility (#1623301) * Wed Sep 19 2018 Eric Sandeen 4.18.0-2