diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-24 14:04:43 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-24 14:04:43 +0100 |
commit | 573b06af740b3f1966aa2ea190494d9c87270786 (patch) | |
tree | d2f5dd29803ad5bbca171bfff9b1ece4ef3d5b3c /package/xfsprogs/patches/patch-fsr_xfs_fsr_c | |
parent | 42ed8eb00eba8691994588b7fca5dbd04d92a59c (diff) | |
parent | 3953de124e87ce3b594fd861b6f111b2df706753 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/xfsprogs/patches/patch-fsr_xfs_fsr_c')
-rw-r--r-- | package/xfsprogs/patches/patch-fsr_xfs_fsr_c | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/package/xfsprogs/patches/patch-fsr_xfs_fsr_c b/package/xfsprogs/patches/patch-fsr_xfs_fsr_c new file mode 100644 index 000000000..5093c2924 --- /dev/null +++ b/package/xfsprogs/patches/patch-fsr_xfs_fsr_c @@ -0,0 +1,57 @@ +--- xfsprogs-3.1.4.orig/fsr/xfs_fsr.c 2010-10-01 19:33:38.000000000 +0200 ++++ xfsprogs-3.1.4/fsr/xfs_fsr.c 2011-01-22 20:34:12.465325200 +0100 +@@ -35,7 +35,6 @@ + #include <sys/wait.h> + #include <sys/vfs.h> + #include <sys/statvfs.h> +-#include <sys/xattr.h> + + + #ifndef XFS_XFLAG_NODEFRAG +@@ -1003,6 +1002,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 */ +@@ -1013,6 +1013,7 @@ fsr_setup_attr_fork( + } + goto out; + } ++#endif + + /* attr2 w/ fork offsets */ + +@@ -1050,6 +1051,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) { + ret = fsetxattr(tfd, name, "XX", 2, XATTR_CREATE); + if (ret) { +@@ -1058,7 +1060,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. +@@ -1097,11 +1099,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 */ + |