picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Lennart Poettering 2019-03-28 18:41:39 +01:00
parent 70d8401d74
commit d629ba7045
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/basic/chattr-util.h
View File

@ -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);

19
src/tmpfiles/tmpfiles.c
View File

@ -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);