From 224b010aaf7ecf15eb7ed33225881502954419cb Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 27 Nov 2015 07:31:41 +0100 Subject: xfsprogs: update to latest stable, unbreak for uClibc-ng builds --- package/xfsprogs/patches/patch-fsr_xfs_fsr_c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'package/xfsprogs/patches/patch-fsr_xfs_fsr_c') diff --git a/package/xfsprogs/patches/patch-fsr_xfs_fsr_c b/package/xfsprogs/patches/patch-fsr_xfs_fsr_c index f220d0d14..c650575a1 100644 --- a/package/xfsprogs/patches/patch-fsr_xfs_fsr_c +++ b/package/xfsprogs/patches/patch-fsr_xfs_fsr_c @@ -1,14 +1,14 @@ ---- xfsprogs-3.1.11.orig/fsr/xfs_fsr.c 2013-05-08 20:14:32.000000000 +0200 -+++ xfsprogs-3.1.11/fsr/xfs_fsr.c 2014-05-06 07:55:04.000000000 +0200 -@@ -35,7 +35,6 @@ +--- xfsprogs-4.3.0.orig/fsr/xfs_fsr.c 2015-11-23 05:24:24.000000000 +0100 ++++ xfsprogs-4.3.0/fsr/xfs_fsr.c 2015-11-27 06:04:00.000000000 +0100 +@@ -30,7 +30,6 @@ + #include #include - #include #include -#include - #ifndef XFS_XFLAG_NODEFRAG -@@ -1034,6 +1033,7 @@ fsr_setup_attr_fork( + #define XFS_XFLAG_NODEFRAG 0x00002000 /* src dependancy, remove later */ +@@ -1044,6 +1043,7 @@ fsr_setup_attr_fork( * use the old method if we have attr1 or the kernel does not yet * support passing the fork offset in the bulkstat data. */ @@ -16,7 +16,7 @@ if (!(fsgeom.flags & XFS_FSOP_GEOM_FLAGS_ATTR2) || bstatp->bs_forkoff == 0) { /* attr1 */ -@@ -1044,6 +1044,7 @@ fsr_setup_attr_fork( +@@ -1054,6 +1054,7 @@ fsr_setup_attr_fork( } goto out; } @@ -24,24 +24,24 @@ /* attr2 w/ fork offsets */ -@@ -1081,6 +1082,7 @@ fsr_setup_attr_fork( +@@ -1095,6 +1096,7 @@ fsr_setup_attr_fork( * If there is no attribute, then we need to create one to get * an attribute fork at the default location. */ +#if 0 if (!tbstat.bs_forkoff) { + ASSERT(i == 0); ret = fsetxattr(tfd, name, "XX", 2, XATTR_CREATE); - if (ret) { -@@ -1089,7 +1091,7 @@ fsr_setup_attr_fork( +@@ -1141,7 +1143,7 @@ fsr_setup_attr_fork( + continue; } - continue; } - +#endif /* * make a progress check so we don't get stuck trying to extend * a large btree form attribute fork. -@@ -1128,11 +1130,13 @@ fsr_setup_attr_fork( +@@ -1177,11 +1179,13 @@ fsr_setup_attr_fork( } /* we need to grow the attr fork, so create another attr */ -- cgit v1.2.3