diff options
| author | Kay Sievers <kay@vrfy.org> | 2014-05-28 17:36:40 +0800 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2014-05-28 17:36:40 +0800 |
| commit | d2edfae0f9bdbecf6a8518e2a5bcf06f470e0d9e (patch) | |
| tree | 10cddc44db05b62c3d57b9b741eef95eef001aae /src/journal | |
| parent | c9679c652b3c31f2510e8805d81630680ebc7e95 (diff) | |
build-sys: use glibc's xattr support instead of requiring libattr
Diffstat (limited to 'src/journal')
| -rw-r--r-- | src/journal/journal-file.c | 7 | ||||
| -rw-r--r-- | src/journal/journal-vacuum.c | 10 |
2 files changed, 2 insertions, 15 deletions
diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c index f2f1f35fc3..b3b1ffc3c0 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c @@ -26,10 +26,7 @@ #include <sys/statvfs.h> #include <fcntl.h> #include <stddef.h> - -#ifdef HAVE_XATTR -#include <attr/xattr.h> -#endif +#include <sys/xattr.h> #include "journal-def.h" #include "journal-file.h" @@ -2511,7 +2508,6 @@ int journal_file_open( } if (f->last_stat.st_size == 0 && f->writable) { -#ifdef HAVE_XATTR uint64_t crtime; /* Let's attach the creation time to the journal file, @@ -2526,7 +2522,6 @@ int journal_file_open( crtime = htole64((uint64_t) now(CLOCK_REALTIME)); fsetxattr(f->fd, "user.crtime_usec", &crtime, sizeof(crtime), XATTR_CREATE); -#endif #ifdef HAVE_GCRYPT /* Try to load the FSPRG state, and if we can't, then diff --git a/src/journal/journal-vacuum.c b/src/journal/journal-vacuum.c index ebe5e4218e..086b40f943 100644 --- a/src/journal/journal-vacuum.c +++ b/src/journal/journal-vacuum.c @@ -24,10 +24,7 @@ #include <sys/stat.h> #include <sys/statvfs.h> #include <unistd.h> - -#ifdef HAVE_XATTR -#include <attr/xattr.h> -#endif +#include <sys/xattr.h> #include "journal-def.h" #include "journal-file.h" @@ -79,11 +76,8 @@ static void patch_realtime( unsigned long long *realtime) { usec_t x; - -#ifdef HAVE_XATTR uint64_t crtime; _cleanup_free_ const char *path = NULL; -#endif /* The timestamp was determined by the file name, but let's * see if the file might actually be older than the file name @@ -106,7 +100,6 @@ static void patch_realtime( if (x > 0 && x != (usec_t) -1 && x < *realtime) *realtime = x; -#ifdef HAVE_XATTR /* Let's read the original creation time, if possible. Ideally * we'd just query the creation time the FS might provide, but * unfortunately there's currently no sane API to query @@ -125,7 +118,6 @@ static void patch_realtime( if (crtime > 0 && crtime != (uint64_t) -1 && crtime < *realtime) *realtime = crtime; } -#endif } static int journal_file_empty(int dir_fd, const char *name) { |