1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
--- 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 <sys/ioctl.h>
#include <sys/wait.h>
#include <sys/statvfs.h>
-#include <sys/xattr.h>
#ifndef XFS_XFLAG_NODEFRAG
#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.
*/
+#if 0
if (!(fsgeom.flags & XFS_FSOP_GEOM_FLAGS_ATTR2) ||
bstatp->bs_forkoff == 0) {
/* attr1 */
@@ -1054,6 +1054,7 @@ fsr_setup_attr_fork(
}
goto out;
}
+#endif
/* attr2 w/ fork offsets */
@@ -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);
@@ -1141,7 +1143,7 @@ fsr_setup_attr_fork(
continue;
}
}
-
+#endif
/*
* make a progress check so we don't get stuck trying to extend
* a large btree form attribute fork.
@@ -1177,11 +1179,13 @@ fsr_setup_attr_fork(
}
/* we need to grow the attr fork, so create another attr */
+#if 0
ret = fsetxattr(tfd, name, "XX", 2, XATTR_CREATE);
if (ret) {
fsrprintf(_("could not set ATTR\n"));
return -1;
}
+#endif
} while (++i < 100); /* don't go forever */
|
