summaryrefslogtreecommitdiff
path: root/sys/ufs/lfs/lfs.h
diff options
context:
space:
mode:
Diffstat (limited to 'sys/ufs/lfs/lfs.h')
-rw-r--r--sys/ufs/lfs/lfs.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/sys/ufs/lfs/lfs.h b/sys/ufs/lfs/lfs.h
index 35f88803e0b..7f9be0158a3 100644
--- a/sys/ufs/lfs/lfs.h
+++ b/sys/ufs/lfs/lfs.h
@@ -1,4 +1,5 @@
-/* $NetBSD: lfs.h,v 1.6 1994/12/21 20:01:01 mycroft Exp $ */
+/* $OpenBSD: lfs.h,v 1.2 1996/02/27 07:13:18 niklas Exp $ */
+/* $NetBSD: lfs.h,v 1.7 1996/02/09 22:28:45 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -263,9 +264,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; \
}
@@ -274,11 +275,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)); \
}
/*