From f22969f3734616c347744861d821ae56d174012c Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Thu, 21 Jan 2021 11:16:36 +0000 Subject: [PATCH] Accepting request 865244 from home:dirkmueller:branches:filesystems - update to 5.10.0: - xfs_repair: remove old code for mountpoint inodes - xfsprogs: Add inode btree counter feature - xfsprogs: Add bigtime feature for Y2038 - xfsprogs: Polish translation update - mkfs.xfs: Add config file feature - mkfs.xfs: allow users to specify rtinherit=0 - xfs_repair: simplify bmap_next_offset - man: various manpage updates - libxfs: remove some old dead code - libxfs: add realtime extent tracking - libxfs changes merged from kernel 5.10 - refresh 0001-repair-shift-inode-back-into-place-if-corrupted-by-b.patch against libxfs changes OBS-URL: https://build.opensuse.org/request/show/865244 OBS-URL: https://build.opensuse.org/package/show/filesystems/xfsprogs?expand=0&rev=101 --- ...de-back-into-place-if-corrupted-by-b.patch | 30 +++++++++++-------- xfsprogs-5.10.0.tar.sign | 17 +++++++++++ xfsprogs-5.10.0.tar.xz | 3 ++ xfsprogs-5.9.0.tar.sign | 17 ----------- xfsprogs-5.9.0.tar.xz | 3 -- xfsprogs.changes | 18 +++++++++++ xfsprogs.spec | 14 ++++----- 7 files changed, 62 insertions(+), 40 deletions(-) create mode 100644 xfsprogs-5.10.0.tar.sign create mode 100644 xfsprogs-5.10.0.tar.xz delete mode 100644 xfsprogs-5.9.0.tar.sign delete mode 100644 xfsprogs-5.9.0.tar.xz diff --git a/0001-repair-shift-inode-back-into-place-if-corrupted-by-b.patch b/0001-repair-shift-inode-back-into-place-if-corrupted-by-b.patch index d871174..a53b1bf 100644 --- a/0001-repair-shift-inode-back-into-place-if-corrupted-by-b.patch +++ b/0001-repair-shift-inode-back-into-place-if-corrupted-by-b.patch @@ -38,9 +38,11 @@ Signed-off-by: Jeff Mahoney repair/dinode.c | 184 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 178 insertions(+), 6 deletions(-) ---- a/repair/dinode.c -+++ b/repair/dinode.c -@@ -2200,6 +2200,158 @@ _("would clear obsolete nlink field in v +Index: xfsprogs-5.10.0/repair/dinode.c +=================================================================== +--- xfsprogs-5.10.0.orig/repair/dinode.c ++++ xfsprogs-5.10.0/repair/dinode.c +@@ -2179,6 +2179,160 @@ _("Bad %s nsec %u on inode %" PRIu64 ", } } @@ -69,6 +71,7 @@ Signed-off-by: Jeff Mahoney +repair_inode_with_bad_atomic(xfs_dinode_t *dino, xfs_mount_t *mp) +{ + xfs_dinode_t fixed; ++ struct xfs_legacy_timestamp *lts; + uint64_t tmp64; + uint32_t tmp32; + char tmpuuid[16]; @@ -86,13 +89,14 @@ Signed-off-by: Jeff Mahoney + memcpy(&fixed.di_uuid, uuid, sizeof(uuid)); + + tmp32 = *(uint32_t *)&dino->di_pad2[4]; -+ fixed.di_crtime.t_sec = cpu_to_be32(tmp32); ++ lts = (struct xfs_legacy_timestamp *)&(fixed.di_crtime); ++ lts->t_sec = cpu_to_be32(tmp32); + tmp32 = *(uint32_t *)&dino->di_pad2[8]; -+ fixed.di_crtime.t_nsec = cpu_to_be32(tmp32); ++ lts->t_nsec = cpu_to_be32(tmp32); + -+ tmp64 = be32_to_cpu(dino->di_crtime.t_nsec); ++ tmp64 = be32_to_cpu(((struct xfs_legacy_timestamp *)(&(dino->di_crtime)))->t_nsec); + tmp64 <<= 32; -+ tmp64 |= be32_to_cpu(dino->di_crtime.t_sec); ++ tmp64 |= be32_to_cpu(((struct xfs_legacy_timestamp *)(&(dino->di_crtime)))->t_sec); + fixed.di_ino = cpu_to_be64(tmp64); + + tmp64 = be64_to_cpu(fixed.di_ino); @@ -199,7 +203,7 @@ Signed-off-by: Jeff Mahoney /* * returns 0 if the inode is ok, 1 if the inode is corrupt * check_dups can be set to 1 *only* when called by the -@@ -2224,7 +2376,8 @@ process_dinode_int(xfs_mount_t *mp, +@@ -2203,7 +2357,8 @@ process_dinode_int(xfs_mount_t *mp, * duplicate blocks */ int extra_attr_check, /* 1 == do attribute format and value checks */ int *isa_dir, /* out == 1 if inode is a directory */ @@ -209,7 +213,7 @@ Signed-off-by: Jeff Mahoney { xfs_rfsblock_t totblocks = 0; xfs_rfsblock_t atotblocks = 0; -@@ -2322,6 +2475,25 @@ process_dinode_int(xfs_mount_t *mp, +@@ -2319,6 +2474,25 @@ process_dinode_int(xfs_mount_t *mp, * memory and hence invalidated the CRC. */ if (xfs_sb_version_hascrc(&mp->m_sb)) { @@ -235,7 +239,7 @@ Signed-off-by: Jeff Mahoney if (be64_to_cpu(dino->di_ino) != lino) { if (!uncertain) do_warn( -@@ -2332,8 +2504,7 @@ _("inode identifier %llu mismatch on ino +@@ -2329,8 +2503,7 @@ _("inode identifier %llu mismatch on ino return 1; goto clear_bad_out; } @@ -245,7 +249,7 @@ Signed-off-by: Jeff Mahoney if (!uncertain) do_warn( _("UUID mismatch on inode %" PRIu64 "\n"), lino); -@@ -2878,7 +3049,8 @@ process_dinode( +@@ -2911,7 +3084,8 @@ process_dinode( #endif return process_dinode_int(mp, dino, agno, ino, was_free, dirty, used, verify_mode, uncertain, ino_discovery, @@ -255,7 +259,7 @@ Signed-off-by: Jeff Mahoney } /* -@@ -2905,7 +3077,7 @@ verify_dinode( +@@ -2938,7 +3112,7 @@ verify_dinode( return process_dinode_int(mp, dino, agno, ino, 0, &dirty, &used, verify_mode, uncertain, ino_discovery, @@ -264,7 +268,7 @@ Signed-off-by: Jeff Mahoney } /* -@@ -2931,5 +3103,5 @@ verify_uncertain_dinode( +@@ -2964,5 +3138,5 @@ verify_uncertain_dinode( return process_dinode_int(mp, dino, agno, ino, 0, &dirty, &used, verify_mode, uncertain, ino_discovery, diff --git a/xfsprogs-5.10.0.tar.sign b/xfsprogs-5.10.0.tar.sign new file mode 100644 index 0000000..24044a1 --- /dev/null +++ b/xfsprogs-5.10.0.tar.sign @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (GNU/Linux) + +iQIcBAABAgAGBQJf0/EFAAoJECCuFpLhPd7g3ewQALwwq+7/dcQNX0cY9AZFcL8w +0TP28CVu+VY7u92V9uEoY8IS0cKiSekb6a8TTDjm03gieP1gHCztLe9C2kC81GcN +fz1xa2W6V8+N+7oqQhiCioAwmetr6hOcZBfyC0sEgMVv+uL/E/eI+B1TWQSiDTbu +lWfneev9TLHOaV7q4bhIXqohB5TmMWfPVPsfT/a/HCkD3cWXpAImqTMpcVzMuw6j +LloSSkcAteVPsti4L9ZFLLaITZb8ebkWlHMTaSfHEvCjVVbgXnv16E6r/ZHBwPwH +gEER1a2yKfGqdN2Ajs9SLRxt7VEuwgZ5I+YFOS0X31kiGfUL1HDuHNr81xUPQRrI +V3U4y3BairBqGzcm/dEDlNbhxsQJqpL661+VhJh8gLvRZuC4xufUzwEqnvjXxP0E +laTTsioNCkHATJrJC6G3ynMiRNj100takb7Cfp2+lRLu4W4LP4OCZY5YxKO+avW0 +p1ApzR4Mgg2qwdfeHNXmn53F8QVmUrjxwcDaSf6KStdU2EHlQsnJcSik2Q4D3AJt +RctLqnVcSgSmqXdBl3kIcFZwG206KvCtxFdCTUGqrtPjLnBNk25MmRHAJBVodL9B +6IrW4w5B5pWk6X44xoRDI8TAGKf30j7nDlkpMD9ntHyzMO49zrFiWsh6OK3/uSD4 ++viuljfjEbjcaFrojAmK +=K7TB +-----END PGP SIGNATURE----- diff --git a/xfsprogs-5.10.0.tar.xz b/xfsprogs-5.10.0.tar.xz new file mode 100644 index 0000000..760b4bb --- /dev/null +++ b/xfsprogs-5.10.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e04017e46d43e4d54b9a560fd7cea922520f8f6ef882404969d20cd4e5c790e9 +size 1273332 diff --git a/xfsprogs-5.9.0.tar.sign b/xfsprogs-5.9.0.tar.sign deleted file mode 100644 index 4ebd7d6..0000000 --- a/xfsprogs-5.9.0.tar.sign +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) - -iQIcBAABAgAGBQJfjwV7AAoJECCuFpLhPd7gfj4P/3jWleIk/oL+9t5KP8Mh4d91 -k1IAF0n9wKY/xVvx83DYUcFwfVZas69ElGbK3zCxOZIUb0q1eg5XYqcD25ljlxPq -8Htp4N67mFjUfeTVCsAFXyMgfY4qpAHQQCesaY/I/clGq7XsiH1piKH+8DQOEAQf -hdnb8Lsi4D4yBtw0Bifw+67HOsRs5vXVDQwTD9Os74l7WML97WJYKahvMqN9NGhQ -T0IF9Y0xJj9JJnV6NJe0yCo3n7uwRvZ0faimmyTcjqHyiL2UaX+LINTCdYS5HyPP -RrmtDig28k6N+e2rnv0OsT2qDsDctvsNqVf9lZukl2OljOM2NJksXTe/CBpggVOR -HVV+Epp6fkJ2+Qush3X3ETku8+cKoh5l4cvfw1o28bYgjW/ooB2isxiq5PKnEisP -Cecq82a7FtzaPEhvubujHWxeENysnsQ1kfaQJTgmvVc/TU/qWEst/b6YEdCXK7rm -b4eGVJpub5rzsw18JAcCJjSfsPaGQaIFZryZZbJPsfykL9cMehdhfpWkTvGxFbV5 -XJGAlkZW5d6JrDLGbVBYlmTEI/Zr0owsrgdB8fgz9bF5DYVjfEYogeW/ySD+YOPu -DbojQoyXeEtje0Gv0AhzIVryzaIFAWRRvh+qsa9T9832zEsTuQ38MNKTwX1nvXBM -jA0tZ/5uTZl7nfWslBr6 -=/0lo ------END PGP SIGNATURE----- diff --git a/xfsprogs-5.9.0.tar.xz b/xfsprogs-5.9.0.tar.xz deleted file mode 100644 index 8cd9c8d..0000000 --- a/xfsprogs-5.9.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bc5c805596bc609a18dc1f1b4ed6a2821dba9f47408ec00e7799ceea1b2097f1 -size 1263364 diff --git a/xfsprogs.changes b/xfsprogs.changes index a4c5a34..d86fb23 100644 --- a/xfsprogs.changes +++ b/xfsprogs.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Mon Jan 4 13:54:11 UTC 2021 - Dirk Müller + +- update to 5.10.0: + - xfs_repair: remove old code for mountpoint inodes + - xfsprogs: Add inode btree counter feature + - xfsprogs: Add bigtime feature for Y2038 + - xfsprogs: Polish translation update + - mkfs.xfs: Add config file feature + - mkfs.xfs: allow users to specify rtinherit=0 + - xfs_repair: simplify bmap_next_offset + - man: various manpage updates + - libxfs: remove some old dead code + - libxfs: add realtime extent tracking + - libxfs changes merged from kernel 5.10 +- refresh 0001-repair-shift-inode-back-into-place-if-corrupted-by-b.patch + against libxfs changes + ------------------------------------------------------------------- Tue Oct 20 16:16:43 UTC 2020 - Anthony Iliopoulos diff --git a/xfsprogs.spec b/xfsprogs.spec index 24b1365..8bbf2a2 100644 --- a/xfsprogs.spec +++ b/xfsprogs.spec @@ -1,7 +1,7 @@ # # spec file for package xfsprogs # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,7 @@ %define libname libhandle1 Name: xfsprogs -Version: 5.9.0 +Version: 5.10.0 Release: 0 Summary: Utilities for managing the XFS file system License: GPL-2.0-or-later @@ -42,9 +42,10 @@ Patch2: 0001-repair-shift-inode-back-into-place-if-corrupted-by-b.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: libblkid-devel +BuildRequires: libedit-devel +BuildRequires: libinih-devel BuildRequires: libuuid-devel BuildRequires: pkgconfig -BuildRequires: libedit-devel BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): coreutils @@ -56,7 +57,7 @@ BuildRequires: suse-module-tools %if %{with systemd} BuildRequires: pkgconfig(systemd) %endif -Suggests: xfsprogs-scrub +Suggests: xfsprogs-scrub %description A set of commands to use the XFS file system, including mkfs.xfs. @@ -99,10 +100,9 @@ system-specific programs. If you install xfsprogs-devel, you will also want to install xfsprogs. %package -n xfsprogs-scrub -Summary: XFS scrubbing scripts and service files -License: GPL-2.0-or-later +Summary: XFS scrubbing scripts and service files Group: System/Filesystems -Requires: xfsprogs +Requires: xfsprogs %description -n xfsprogs-scrub Scripts and systemd service files for background scrubbing of metadata