From d629ba70459251c1d5401dae7cdc0ed0573c8397 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 28 Mar 2019 18:41:39 +0100 Subject: [PATCH] tmpfiles: move full chattr flag set to chattr-util.h It's a pretty generic concept and fits will there, hence let's move it. --- src/basic/chattr-util.h | 17 +++++++++++++++++ src/tmpfiles/tmpfiles.c | 19 +------------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/basic/chattr-util.h b/src/basic/chattr-util.h index eb6bfbe461..29070c848a 100644 --- a/src/basic/chattr-util.h +++ b/src/basic/chattr-util.h @@ -15,6 +15,23 @@ FS_NOCOMP_FL | \ FS_PROJINHERIT_FL) +#define CHATTR_ALL_FL \ + (FS_NOATIME_FL | \ + FS_SYNC_FL | \ + FS_DIRSYNC_FL | \ + FS_APPEND_FL | \ + FS_COMPR_FL | \ + FS_NODUMP_FL | \ + FS_EXTENT_FL | \ + FS_IMMUTABLE_FL | \ + FS_JOURNAL_DATA_FL | \ + FS_SECRM_FL | \ + FS_UNRM_FL | \ + FS_NOTAIL_FL | \ + FS_TOPDIR_FL | \ + FS_NOCOW_FL | \ + FS_PROJINHERIT_FL) + int chattr_fd(int fd, unsigned value, unsigned mask, unsigned *previous); int chattr_path(const char *p, unsigned value, unsigned mask, unsigned *previous); diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index 5251c741ee..84e104f9b5 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -1096,23 +1096,6 @@ static int path_set_acls(Item *item, const char *path) { return r; } -#define ATTRIBUTES_ALL \ - (FS_NOATIME_FL | \ - FS_SYNC_FL | \ - FS_DIRSYNC_FL | \ - FS_APPEND_FL | \ - FS_COMPR_FL | \ - FS_NODUMP_FL | \ - FS_EXTENT_FL | \ - FS_IMMUTABLE_FL | \ - FS_JOURNAL_DATA_FL | \ - FS_SECRM_FL | \ - FS_UNRM_FL | \ - FS_NOTAIL_FL | \ - FS_TOPDIR_FL | \ - FS_NOCOW_FL | \ - FS_PROJINHERIT_FL) - static int parse_attribute_from_arg(Item *item) { static const struct { @@ -1186,7 +1169,7 @@ static int parse_attribute_from_arg(Item *item) { } if (mode == MODE_SET) - mask |= ATTRIBUTES_ALL; + mask |= CHATTR_ALL_FL; assert(mask != 0);