Fix signedness warnings with careful casts and replace a re-defined variable.

(Missed this chunk as part of previous commit to libsa/ufs.c)

OK krw@

1 files changed, 4 insertions, 4 deletions

diff --git a/sys/ufs/ffs/fs.h b/sys/ufs/ffs/fs.h
index 43c5c8a5e74..7faec6a5b5f 100644
--- a/sys/ufs/ffs/fs.h
+++ b/sys/ufs/ffs/fs.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fs.h,v 1.41 2015/01/20 18:08:16 deraadt Exp $	*/
+/*	$OpenBSD: fs.h,v 1.42 2016/11/27 13:27:55 reyk Exp $	*/
 /*	$NetBSD: fs.h,v 1.6 1995/04/12 21:21:02 mycroft Exp $	*/
 
 /*
@@ -550,16 +550,16 @@ struct ocg {
  */
 #define blksize(fs, ip, lbn) \
 	(((lbn) >= NDADDR || DIP((ip), size) >= ((lbn) + 1) << (fs)->fs_bshift) \
-	    ? (fs)->fs_bsize \
+	    ? (u_int64_t)(fs)->fs_bsize \
 	    : (fragroundup(fs, blkoff(fs, DIP((ip), size)))))
 #define dblksize(fs, dip, lbn) \
 	(((lbn) >= NDADDR || (dip)->di_size >= ((lbn) + 1) << (fs)->fs_bshift) \
-	    ? (fs)->fs_bsize \
+	    ? (u_int64_t)(fs)->fs_bsize \
 	    : (fragroundup(fs, blkoff(fs, (dip)->di_size))))
 
 #define sblksize(fs, size, lbn) \
         (((lbn) >= NDADDR || (size) >= ((lbn) + 1) << (fs)->fs_bshift) \
-            ? (fs)->fs_bsize \
+            ? (u_int64_t)(fs)->fs_bsize \
             : (fragroundup(fs, blkoff(fs, (size)))))