UFS fs.h: clear warning from use by makefs(1)
ClosedPublic
Actions

Authored by emaste on May 3 2017, 5:01 PM.

Details

Reviewers

kib
mckusick

Commits

rS317832: UFS fs.h: clear warning from use in makefs(1)

Summary

A different approach to cleaning up makefs warnings will change types or casts there, as opposed to the change in D10578. There is one case where a signedness warning arises from a macro in fs.h, so must be addressed in the macro itself.

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

emaste created this revision.May 3 2017, 5:01 PM

I checked all users of blksize().

This revision is now accepted and ready to land.May 3 2017, 7:26 PM

emaste mentioned this in D10578: fs.h: fix signed/unsigned issues, from NetBSD.May 3 2017, 7:52 PM

I like this solution much better than D10578.

Closed by commit rS317832: UFS fs.h: clear warning from use in makefs(1) (authored by emaste). · Explain WhyMay 5 2017, 3:27 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

head/

sys/

ufs/

ffs/

fs.h

3 lines

Diff 28065

View Options

head/sys/ufs/ffs/fs.h

Show First 20 Lines • Show All 602 Lines • ▼ Show 20 Lines	#define freespace(fs, percentreserved) \
(blkstofrags((fs), (fs)->fs_cstotal.cs_nbfree) + \		(blkstofrags((fs), (fs)->fs_cstotal.cs_nbfree) + \
(fs)->fs_cstotal.cs_nffree - \		(fs)->fs_cstotal.cs_nffree - \
(((off_t)((fs)->fs_dsize)) * (percentreserved) / 100))		(((off_t)((fs)->fs_dsize)) * (percentreserved) / 100))

/*		/*
* Determining the size of a file block in the filesystem.		* Determining the size of a file block in the filesystem.
*/		*/
#define blksize(fs, ip, lbn) \		#define blksize(fs, ip, lbn) \
(((lbn) >= UFS_NDADDR \|\| (ip)->i_size >= smalllblktosize(fs, (lbn) + 1)) \		(((lbn) >= UFS_NDADDR \|\| (ip)->i_size >= \
		(uint64_t)smalllblktosize(fs, (lbn) + 1)) \
? (fs)->fs_bsize \		? (fs)->fs_bsize \
: (fragroundup(fs, blkoff(fs, (ip)->i_size))))		: (fragroundup(fs, blkoff(fs, (ip)->i_size))))
#define sblksize(fs, size, lbn) \		#define sblksize(fs, size, lbn) \
(((lbn) >= UFS_NDADDR \|\| (size) >= ((lbn) + 1) << (fs)->fs_bshift) \		(((lbn) >= UFS_NDADDR \|\| (size) >= ((lbn) + 1) << (fs)->fs_bshift) \
? (fs)->fs_bsize \		? (fs)->fs_bsize \
: (fragroundup(fs, blkoff(fs, (size)))))		: (fragroundup(fs, blkoff(fs, (size)))))

/*		/*
▲ Show 20 Lines • Show All 159 Lines • Show Last 20 Lines

UFS fs.h: clear warning from use by makefs(1)ClosedPublicActions