summaryrefslogtreecommitdiff
path: root/sys/ufs/lfs/lfs.h
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>1996-10-18 14:46:25 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>1996-10-18 14:46:25 +0000
commite2c0448bf81085cbfab8e83c330de5be88c29afb (patch)
treee09fd65c6e8572f0cb488187fcc7ccc69ae54325 /sys/ufs/lfs/lfs.h
parent56cd0d90b0dce1ba2fd080736b51b871c50e7407 (diff)
-Wall happieness
Diffstat (limited to 'sys/ufs/lfs/lfs.h')
-rw-r--r--sys/ufs/lfs/lfs.h16
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/ufs/lfs/lfs.h b/sys/ufs/lfs/lfs.h
index c39bbc85abf..b049b4b6e61 100644
--- a/sys/ufs/lfs/lfs.h
+++ b/sys/ufs/lfs/lfs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: lfs.h,v 1.4 1996/07/01 11:07:34 downsj Exp $ */
+/* $OpenBSD: lfs.h,v 1.5 1996/10/18 14:46:22 mickey Exp $ */
/* $NetBSD: lfs.h,v 1.7 1996/02/09 22:28:45 christos Exp $ */
/*-
@@ -248,8 +248,8 @@ struct segsum {
((int)((loc) & (fs)->lfs_ffmask))
#define fsbtodb(fs, b) ((b) << (fs)->lfs_fsbtodb)
#define dbtofsb(fs, b) ((b) >> (fs)->lfs_fsbtodb)
-#define fragstodb(fs, b) ((b) << (fs)->lfs_fsbtodb - (fs)->lfs_fbshift)
-#define dbtofrags(fs, b) ((b) >> (fs)->lfs_fsbtodb - (fs)->lfs_fbshift)
+#define fragstodb(fs, b) ((b) << ((fs)->lfs_fsbtodb - (fs)->lfs_fbshift))
+#define dbtofrags(fs, b) ((b) >> ((fs)->lfs_fsbtodb - (fs)->lfs_fbshift))
#define lblkno(fs, loc) ((loc) >> (fs)->lfs_bshift)
#define lblktosize(fs, blk) ((blk) << (fs)->lfs_bshift)
#define numfrags(fs, loc) /* calculates (loc / fs->lfs_fsize) */ \
@@ -289,9 +289,9 @@ struct segsum {
#define LFS_IENTRY(IP, F, IN, BP) { \
int _e; \
VTOI((F)->lfs_ivnode)->i_flag |= IN_ACCESS; \
- if (_e = bread((F)->lfs_ivnode, \
+ if ((_e = bread((F)->lfs_ivnode, \
(IN) / (F)->lfs_ifpb + (F)->lfs_cleansz + (F)->lfs_segtabsz,\
- (F)->lfs_bsize, NOCRED, &(BP))) \
+ (F)->lfs_bsize, NOCRED, &(BP))) != 0) \
panic("lfs: ifile read %d", _e); \
(IP) = (IFILE *)(BP)->b_data + (IN) % (F)->lfs_ifpb; \
}
@@ -300,11 +300,11 @@ struct segsum {
#define LFS_SEGENTRY(SP, F, IN, BP) { \
int _e; \
VTOI((F)->lfs_ivnode)->i_flag |= IN_ACCESS; \
- if (_e = bread((F)->lfs_ivnode, \
+ if ((_e = bread((F)->lfs_ivnode, \
((IN) >> (F)->lfs_sushift) + (F)->lfs_cleansz, \
- (F)->lfs_bsize, NOCRED, &(BP))) \
+ (F)->lfs_bsize, NOCRED, &(BP))) != 0) \
panic("lfs: ifile read: %d", _e); \
- (SP) = (SEGUSE *)(BP)->b_data + ((IN) & (F)->lfs_sepb - 1); \
+ (SP) = (SEGUSE *)(BP)->b_data + ((IN) & ((F)->lfs_sepb - 1)); \
}
/*