diff options
| -rw-r--r-- | sys/ufs/ufs/dinode.h | 5 | ||||
| -rw-r--r-- | sys/ufs/ufs/ufs_readwrite.c | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/sys/ufs/ufs/dinode.h b/sys/ufs/ufs/dinode.h index 094546e9e4a..1fe6ad2875a 100644 --- a/sys/ufs/ufs/dinode.h +++ b/sys/ufs/ufs/dinode.h @@ -40,6 +40,9 @@ * @(#)dinode.h 8.6 (Berkeley) 9/13/94 */ +#ifndef _UFS_DINODE_H_ +#define _UFS_DINODE_H_ + /* * The root inode is the root of the file system. Inode 0 can't be used for * normal purposes and historically bad blocks were linked to inode 1, thus @@ -123,3 +126,5 @@ struct dinode { #define IFLNK 0120000 /* Symbolic link. */ #define IFSOCK 0140000 /* UNIX domain socket. */ #define IFWHT 0160000 /* Whiteout. */ + +#endif /* _UFS_DINODE_H_ */ diff --git a/sys/ufs/ufs/ufs_readwrite.c b/sys/ufs/ufs/ufs_readwrite.c index bf65f80974b..e82ecffeae5 100644 --- a/sys/ufs/ufs/ufs_readwrite.c +++ b/sys/ufs/ufs/ufs_readwrite.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ufs_readwrite.c,v 1.4 1996/06/24 03:35:04 downsj Exp $ */ +/* $OpenBSD: ufs_readwrite.c,v 1.5 1996/07/01 06:52:24 downsj Exp $ */ /* $NetBSD: ufs_readwrite.c,v 1.9 1996/05/11 18:27:57 mycroft Exp $ */ /*- @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)ufs_readwrite.c 8.8 (Berkeley) 8/4/94 + * @(#)ufs_readwrite.c 8.11 (Berkeley) 5/8/95 */ /* @@ -42,7 +42,7 @@ */ #ifdef LFS_READWRITE -#define BLKSIZE(a, b, c) blksize(a) +#define BLKSIZE(a, b, c) blksize(a, b, c) #define FS struct lfs #define I_FS i_lfs #define READ lfs_read @@ -268,7 +268,7 @@ WRITE(v) xfersize = uio->uio_resid; #ifdef LFS_READWRITE (void)lfs_check(vp, lbn); - error = lfs_balloc(vp, xfersize, lbn, &bp); + error = lfs_balloc(vp, blkoffset, xfersize, lbn, &bp); #else if (fs->fs_bsize > xfersize) flags |= B_CLRBUF; |