[PATCH 0/3] use sys/xattr.h instead of attr/xattr.h

[PATCH 0/3] use sys/xattr.h instead of attr/xattr.h

[Lu Fengqi]

The attr v2.4.48 has removed <attr/xattr.h>, so remove the check for the
<attr/xattr.h>, and use <sys/xattr.h> instead in fsstress and t_immutable.

Lu Fengqi (3):
  fsstress: use sys/xattr.h instead of attr/xattr.h
  src/t_immutable: use sys/xattr.h instead of attr/xattr.h
  build: remove <attr/xattr.h> check

 configure.ac          |  1 -
 ltp/fsstress.c        |  2 +-
 m4/package_attrdev.m4 | 11 -----------
 src/t_immutable.c     |  2 +-
 4 files changed, 2 insertions(+), 14 deletions(-)

-- 
2.18.0

[PATCH 1/3] fsstress: use sys/xattr.h instead of attr/xattr.h

[Lu Fengqi]

Since attr v2.4.48 has removed <attr/xattr.h>, use <sys/xattr.h>
provided by glibc.

Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
 ltp/fsstress.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ltp/fsstress.c b/ltp/fsstress.c
index 1bffa115bf2d..c1f28e7c4567 100644
--- a/ltp/fsstress.c
+++ b/ltp/fsstress.c
@@ -11,7 +11,7 @@
 #include "global.h"
 
 #ifdef HAVE_ATTR_XATTR_H
-#include <attr/xattr.h>
+#include <sys/xattr.h>
 #endif
 #ifdef HAVE_ATTR_ATTRIBUTES_H
 #include <attr/attributes.h>
-- 
2.18.0

[PATCH 2/3] src/t_immutable: use sys/xattr.h instead of attr/xattr.h

[Lu Fengqi]

Since attr v2.4.48 has removed <attr/xattr.h>, use <sys/xattr.h>
provided by glibc.

Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
 src/t_immutable.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/t_immutable.c b/src/t_immutable.c
index 9a4e0169ec60..eadef78f9cbb 100644
--- a/src/t_immutable.c
+++ b/src/t_immutable.c
@@ -23,7 +23,7 @@
 #include <grp.h>
 #include <libgen.h>
 #include <sys/acl.h>
-#include <attr/xattr.h>
+#include <sys/xattr.h>
 #include <linux/fs.h>
 #include <linux/magic.h>
 #include <xfs/xfs.h>
-- 
2.18.0

[PATCH 3/3] build: remove <attr/xattr.h> check

[Lu Fengqi]

Since fsstress and src/t_immutable don't need attr/xattr.h, just remove
<attr/xattr.h> check.

Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
---
 configure.ac          |  1 -
 m4/package_attrdev.m4 | 11 -----------
 2 files changed, 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index 57092f1c484b..63ea032dc564 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,7 +51,6 @@ AC_PACKAGE_NEED_XFSCTL_MACRO
 AC_PACKAGE_NEED_XFS_HANDLE_H
 
 AC_PACKAGE_NEED_ATTRLIST_LIBHANDLE
-AC_PACKAGE_NEED_ATTR_XATTR_H
 AC_PACKAGE_NEED_ATTRIBUTES_H
 AC_PACKAGE_WANT_ATTRLIST_LIBATTR
 AC_PACKAGE_NEED_GETXATTR_LIBATTR
diff --git a/m4/package_attrdev.m4 b/m4/package_attrdev.m4
index 12251ceb63c3..6bf21b1799e5 100644
--- a/m4/package_attrdev.m4
+++ b/m4/package_attrdev.m4
@@ -1,14 +1,3 @@
-AC_DEFUN([AC_PACKAGE_NEED_ATTR_XATTR_H],
-  [ AC_CHECK_HEADERS([attr/xattr.h])
-    if test "$ac_cv_header_attr_xattr_h" != "yes"; then
-        echo
-        echo 'FATAL ERROR: attr/xattr.h does not exist.'
-        echo 'Install the extended attributes (attr) development package.'
-        echo 'Alternatively, run "make install-dev" from the attr source.'
-        exit 1
-    fi
-  ])
-
 AC_DEFUN([AC_PACKAGE_NEED_ATTR_ERROR_H],
   [ AC_CHECK_HEADERS([attr/error_context.h])
     if test "$ac_cv_header_attr_error_context_h" != "yes"; then
-- 
2.18.0