remove libattr1-dev dependency; check for sys/xattr.h in configure.ac

This commit is contained in:
Sage Weil 2008-05-20 14:27:49 -07:00
parent 83015d321c
commit 1b9a6a096a
2 changed files with 6 additions and 6 deletions

View File

@ -97,7 +97,7 @@ AC_CHECK_HEADER([boost/spirit.hpp],
[AC_MSG_ERROR([Sorry, you need to install the Boost spirit parser library (libboost-dev on debian)])])
AC_LANG([C])
AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdint.h stdlib.h string.h sys/file.h sys/ioctl.h sys/mount.h sys/param.h sys/socket.h sys/statvfs.h sys/time.h sys/vfs.h syslog.h unistd.h utime.h])
AC_CHECK_HEADERS([sys/xattr.h arpa/inet.h fcntl.h netdb.h netinet/in.h stdint.h stdlib.h string.h sys/file.h sys/ioctl.h sys/mount.h sys/param.h sys/socket.h sys/statvfs.h sys/time.h sys/vfs.h syslog.h unistd.h utime.h])
# Checks for typedefs, structures, and compiler characteristics.
AC_HEADER_STDBOOL

View File

@ -49,7 +49,7 @@
#include <errno.h>
#include <fcntl.h>
#include <attr/xattr.h>
#include <sys/xattr.h>
#include <list>
#include <iostream>
@ -1786,8 +1786,8 @@ void Server::handle_client_setxattr(MDRequest *mdr)
return;
}
if ((flags & XATTR_REPLACE) && !cur->xattrs.count(name)) {
dout(10) << "setxattr '" << name << "' XATTR_REPLACE and ENOATTR on " << *cur << dendl;
reply_request(mdr, -ENOATTR);
dout(10) << "setxattr '" << name << "' XATTR_REPLACE and ENODATA on " << *cur << dendl;
reply_request(mdr, -ENODATA);
return;
}
@ -1836,8 +1836,8 @@ void Server::handle_client_removexattr(MDRequest *mdr)
string name(req->get_path2());
if (cur->xattrs.count(name) == 0) {
dout(10) << "removexattr '" << name << "' and ENOATTR on " << *cur << dendl;
reply_request(mdr, -ENOATTR);
dout(10) << "removexattr '" << name << "' and ENODATA on " << *cur << dendl;
reply_request(mdr, -ENODATA);
return;
}