Fix architectures where pointer and u_int have different sizes
ClosedPublic
Actions

Authored by lwhsu on Jan 25 2018, 8:22 AM.

Details

Reviewers

mckusick
delphij
emaste
imp

Commits

rS328393: Fix architectures where pointer and u_int have different sizes

Summary

r328383 seems breaking architectures where pointer and u_int have different
sizes:

https://ci.freebsd.org/job/FreeBSD-head-mips64-build/105/console

00:03:54.601 cc1: warnings being treated as errors
00:03:54.601 /usr/src/sbin/fsck_ffs/fsutil.c: In function 'flush':
00:03:54.601 /usr/src/sbin/fsck_ffs/fsutil.c:372: warning: cast from pointer to integer of different size
00:03:54.601 /usr/src/sbin/fsck_ffs/fsutil.c:372: warning: cast from pointer to integer of different size

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 14574
Build 14708: arc lint + arc unit

Event Timeline

lwhsu created this revision.Jan 25 2018, 8:22 AM

Herald added a subscriber: imp. · View Herald TranscriptJan 25 2018, 8:22 AM

Harbormaster completed remote builds in B14574: Diff 38437.Jan 25 2018, 8:22 AM

lwhsu added reviewers: delphij, emaste.Jan 25 2018, 8:24 AM

This is the right fix.

This revision is now accepted and ready to land.Jan 25 2018, 8:31 AM

Closed by commit rS328393: Fix architectures where pointer and u_int have different sizes (authored by lwhsu). · Explain WhyJan 25 2018, 8:36 AM

This revision was automatically updated to reflect the committed changes.

delphij added inline comments.Jan 25 2018, 9:02 AM

head/sbin/fsck_ffs/fsutil.c
372 ↗	(On Diff #38438)	I'm not 100% sure if this is correct. I _think_ the intention was to give on-disk address (probably b_bno) as the memory pointer is less useful for debugging purposes since we are about to abort. Looking at the context, it seems this is really an assertion that flush() is called with &sblk for BT_SUPERBLK, is this a valid assertion for setup.c:244? (I haven't worked on fsck for quite a few years so it's probably a good idea to defer this to McKusick).

This is the correct fix.

Revision Contents
Changeset List

Path

Size

sbin/

fsck_ffs/

fsutil.c

4 lines

Diff 38437

View Options

Fix architectures where pointer and u_int have different sizesClosedPublicActions