commit 72be1e14e9ade6e08a5f4ae42afb6496467d7d81
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Sat May 4 03:37:26 2019 +0200
- up to 5.0.0
xfsprogs-small_fixes.patch | 65 ----------------------------------------------
xfsprogs.spec | 10 +++----
2 files changed, 4 insertions(+), 71 deletions(-)
---
diff --git a/xfsprogs.spec b/xfsprogs.spec
index 985a57f..f2abc31 100644
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -5,17 +5,16 @@
Summary: Tools for the XFS filesystem
Summary(pl.UTF-8): Narzędzia do systemu plików XFS
Name: xfsprogs
-Version: 4.20.0
-Release: 2
+Version: 5.0.0
+Release: 1
License: LGPL v2.1 (libhandle), GPL v2 (the rest)
Group: Applications/System
Source0:
https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/%{name}-%{version}.tar.gz
-# Source0-md5: 449e475ff861a184606c7d1500de7fb6
+# Source0-md5: 364f04af3708520bf3e6fb04dc19dc00
Source1: xfs_lsprojid
Patch0: %{name}-miscfix-v2.patch
Patch1: %{name}-pl.po-update.patch
-# Patch1-md5: 5fa89df413162a272aadfb3bdfe2330d
-Patch2: xfsprogs-small_fixes.patch
+# Patch1-md5: 28832d2c0aefb92ec17ebfe924c156e3
URL: http://www.xfs.org/
BuildRequires: autoconf >= 2.50
BuildRequires: automake
@@ -111,7 +110,6 @@ Biblioteki statyczne do XFS.
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
%{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' scrub/xfs_scrub_all.in
tools/xfsbuflock.py
diff --git a/xfsprogs-small_fixes.patch b/xfsprogs-small_fixes.patch
deleted file mode 100644
index 2887ba9..0000000
--- a/xfsprogs-small_fixes.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From: Dave Chinner <[email protected]>
-
-If inode_item_done() fails to flush an inode after we've grabbed a
-reference to the underlying buffer during a transaction commit, we
-fail to put the buffer and hence leak it. We then deadlock on the
-next lookup ofthe inode buffer as it is still locked and no-one owns
-it.
-
-To fix it, put the buffer on error so that it gets unlocked and
-can be recovered appropriately in a later phase of repair.
-
-Reported-by: Arkadiusz Miskiewicz <[email protected]>
-Fixes: d15188a1ec14 ("xfs: rework the inline directory verifiers")
-Signed-off-by: Dave Chinner <[email protected]>
----
- libxfs/trans.c | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/libxfs/trans.c b/libxfs/trans.c
-index 46ff8b4ae798..10a35dd47b01 100644
---- a/libxfs/trans.c
-+++ b/libxfs/trans.c
-@@ -824,8 +824,10 @@ _("Transaction block reservation exceeded! %u > %u\n"),
-
- /*
- * Transaction commital code follows (i.e. write to disk in libxfs)
-+ *
-+ * XXX (dgc): should failure to flush the inode (e.g. due to uncorrected
-+ * corruption) result in transaction commit failure w/ EFSCORRUPTED?
- */
--
- static void
- inode_item_done(
- xfs_inode_log_item_t *iip)
-@@ -856,17 +858,24 @@ inode_item_done(
- return;
- }
-
-+ /*
-+ * Flush the inode and disassociate it from the transaction regardless
-+ * of whether the flush succeed or not. If we fail the flush, make sure
-+ * we still release the buffer reference we currently hold.
-+ */
- bp->b_log_item = iip;
- error = libxfs_iflush_int(ip, bp);
-+ ip->i_transp = NULL; /* disassociate from transaction */
-+ bp->b_log_item = NULL; /* remove log item */
-+ bp->b_transp = NULL; /* remove xact ptr */
-+
- if (error) {
- fprintf(stderr, _("%s: warning - iflush_int failed (%d)\n"),
- progname, error);
-+ libxfs_putbuf(bp);
- return;
- }
-
-- ip->i_transp = NULL; /* disassociate from transaction */
-- bp->b_log_item = NULL; /* remove log item */
-- bp->b_transp = NULL; /* remove xact ptr */
- libxfs_writebuf(bp, 0);
- #ifdef XACT_DEBUG
- fprintf(stderr, "flushing dirty inode %llu, buffer %p\n",
---
-2.20.1
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xfsprogs.git/commitdiff/72be1e14e9ade6e08a5f4ae42afb6496467d7d81
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
