Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/ufs/ffs Fix signed/unsigned issues.
details: https://anonhg.NetBSD.org/src/rev/478d5f77f12a
branches: trunk
changeset: 778901:478d5f77f12a
user: christos <christos%NetBSD.org@localhost>
date: Thu Apr 19 17:25:38 2012 +0000
description:
Fix signed/unsigned issues.
diffstat:
sys/ufs/ffs/fs.h | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diffs (33 lines):
diff -r db06af3f2233 -r 478d5f77f12a sys/ufs/ffs/fs.h
--- a/sys/ufs/ffs/fs.h Thu Apr 19 17:09:53 2012 +0000
+++ b/sys/ufs/ffs/fs.h Thu Apr 19 17:25:38 2012 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fs.h,v 1.56 2011/03/06 17:08:38 bouyer Exp $ */
+/* $NetBSD: fs.h,v 1.57 2012/04/19 17:25:38 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1993
@@ -672,7 +672,7 @@
#define lfragtosize(fs, frag) /* calculates ((off_t)frag * fs->fs_fsize) */ \
(((off_t)(frag)) << (fs)->fs_fshift)
#define lblktosize(fs, blk) /* calculates ((off_t)blk * fs->fs_bsize) */ \
- (((off_t)(blk)) << (fs)->fs_bshift)
+ ((uint64_t)(((off_t)(blk)) << (fs)->fs_bshift))
#define lblkno(fs, loc) /* calculates (loc / fs->fs_bsize) */ \
((loc) >> (fs)->fs_bshift)
#define numfrags(fs, loc) /* calculates (loc / fs->fs_fsize) */ \
@@ -704,12 +704,12 @@
*/
#define blksize(fs, ip, lbn) \
(((lbn) >= NDADDR || (ip)->i_size >= lblktosize(fs, (lbn) + 1)) \
- ? (fs)->fs_bsize \
+ ? (uint64_t)(fs)->fs_bsize \
: (fragroundup(fs, blkoff(fs, (ip)->i_size))))
#define sblksize(fs, size, lbn) \
(((lbn) >= NDADDR || (size) >= ((lbn) + 1) << (fs)->fs_bshift) \
- ? (fs)->fs_bsize \
+ ? (uint64_t)(fs)->fs_bsize \
: (fragroundup(fs, blkoff(fs, (size)))))
Home |
Main Index |
Thread Index |
Old Index