shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-23 21:35:11 +03:00
Code

Reintroduce f_type comparison macro

Browse Source 
This reverts commit 4826f0b7b5.

Because statfs.t_type can be int on some architecures, we have to cast
the const magic to the type, otherwise the compiler warns about
signed/unsigned comparison, because the magic can be 32 bit unsigned.

statfs(2) man page is also wrong on some systems, because
f_type is not __SWORD_TYPE on some architecures.

The following program:

int main(int argc, char**argv)
{
        struct statfs s;
        statfs(argv[1], &s);

	printf("sizeof(f_type) = %d\n", sizeof(s.f_type));
	printf("sizeof(__SWORD_TYPE) = %d\n", sizeof(__SWORD_TYPE));
	printf("sizeof(long) = %d\n", sizeof(long));
	printf("sizeof(int) = %d\n", sizeof(int));
	if (sizeof(s.f_type) == sizeof(int)) {
		printf("f_type = 0x%x\n", s.f_type);
	} else {
                printf("f_type = 0x%lx\n", s.f_type);
	}
        return 0;
}

executed on s390x gives for a btrfs:

sizeof(f_type) = 4
sizeof(__SWORD_TYPE) = 8
sizeof(long) = 8
sizeof(int) = 4
f_type = 0x9123683e
This commit is contained in:
Harald Hoyer 2013-04-19 13:44:56 +02:00
parent cbeabcfbc5
commit bdd29249a8
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/journal/sd-journal.c
View File

@ -1251,11 +1251,11 @@ static void check_network(sd_journal *j, int fd) {
return;
j->on_network =
sfs.f_type == (__SWORD_TYPE) CIFS_MAGIC_NUMBER ||
sfs.f_type == (__SWORD_TYPE) CODA_SUPER_MAGIC ||
sfs.f_type == (__SWORD_TYPE) NCP_SUPER_MAGIC ||
sfs.f_type == (__SWORD_TYPE) NFS_SUPER_MAGIC ||
sfs.f_type == (__SWORD_TYPE) SMB_SUPER_MAGIC;
F_TYPE_CMP(sfs.f_type, CIFS_MAGIC_NUMBER) ||
F_TYPE_CMP(sfs.f_type, CODA_SUPER_MAGIC) ||
F_TYPE_CMP(sfs.f_type, NCP_SUPER_MAGIC) ||
F_TYPE_CMP(sfs.f_type, NFS_SUPER_MAGIC) ||
F_TYPE_CMP(sfs.f_type, SMB_SUPER_MAGIC);
}
static int add_file(sd_journal *j, const char *prefix, const char *filename) {

2
src/readahead/readahead-collect.c
View File

@ -505,7 +505,7 @@ done:
on_ssd = fs_on_ssd(root) > 0;
log_debug("On SSD: %s", yes_no(on_ssd));
on_btrfs = statfs(root, &sfs) >= 0 && sfs.f_type == (__SWORD_TYPE) BTRFS_SUPER_MAGIC;
on_btrfs = statfs(root, &sfs) >= 0 && F_TYPE_CMP(sfs.f_type, BTRFS_SUPER_MAGIC);
log_debug("On btrfs: %s", yes_no(on_btrfs));
if (asprintf(&pack_fn_new, "%s/.readahead.new", root) < 0) {

7
src/shared/macro.h
View File

@ -264,6 +264,13 @@ do { \
} \
} while(false)
/* Because statfs.t_type can be int on some architecures, we have to cast
* the const magic to the type, otherwise the compiler warns about
* signed/unsigned comparison, because the magic can be 32 bit unsigned.
*/
#define F_TYPE_CMP(a, b) (a == (typeof(a)) b)
/* Returns the number of chars needed to format variables of the
* specified type as a decimal string. Adds in extra space for a
* negative '-' prefix. */

5
src/shared/util.c
View File

@ -2779,8 +2779,9 @@ int rm_rf_children_dangerous(int fd, bool only_dirs, bool honour_sticky, struct
static int is_temporary_fs(struct statfs *s) {
assert(s);
return s->f_type == (__SWORD_TYPE) TMPFS_MAGIC ||
s->f_type == (__SWORD_TYPE) RAMFS_MAGIC;
return
F_TYPE_CMP(s->f_type, TMPFS_MAGIC) ||
F_TYPE_CMP(s->f_type, RAMFS_MAGIC);
}
int rm_rf_children(int fd, bool only_dirs, bool honour_sticky, struct stat *root_dev) {