summaryrefslogtreecommitdiff
path: root/src/shared/util.c
diff options
context:
space:
mode:
authorHarald Hoyer <harald@redhat.com>2013-04-17 18:03:39 +0200
committerHarald Hoyer <harald@redhat.com>2013-04-17 18:14:25 +0200
commit8c68a70170b31f93c287f29fd06c6c17edaf19ad (patch)
tree0cde44b88db55795d242dde12d9e5c725d173486 /src/shared/util.c
parent90cf049bfe9a7dcb20a1bd0d12e8b2194dbcd357 (diff)
fixed statfs.f_type signed vs unsigned comparisons
statfs.f_type is signed but the filesystem magics are unsigned. Casting the magics to signed will not make the signed. Problem seen on big-endian 64bit s390x with __fsword_t 8 bytes. Casting statfs.f_type to unsigned on the other hand will get us what we need. https://bugzilla.redhat.com/show_bug.cgi?id=953217
Diffstat (limited to 'src/shared/util.c')
-rw-r--r--src/shared/util.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shared/util.c b/src/shared/util.c
index a55b27f878..3a6efe3fce 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -2779,8 +2779,8 @@ 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 == TMPFS_MAGIC ||
- (long)s->f_type == (long)RAMFS_MAGIC;
+ return (unsigned) s->f_type == TMPFS_MAGIC ||
+ (unsigned) s->f_type == RAMFS_MAGIC;
}
int rm_rf_children(int fd, bool only_dirs, bool honour_sticky, struct stat *root_dev) {