diff options
author | Jason Downs <downsj@cvs.openbsd.org> | 1996-07-13 21:49:20 +0000 |
---|---|---|
committer | Jason Downs <downsj@cvs.openbsd.org> | 1996-07-13 21:49:20 +0000 |
commit | 355333b6f0392f71e9faa60bde076b1d89372bed (patch) | |
tree | f07838cef0e2909582de8b0e5c5b9b98b5391609 | |
parent | d7e8dadb5bf8bf20da56d2e2278ae65ac1506512 (diff) |
cleanup
-rw-r--r-- | sys/ufs/ufs/ufs_readwrite.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/sys/ufs/ufs/ufs_readwrite.c b/sys/ufs/ufs/ufs_readwrite.c index e82ecffeae5..1ab5cf5bbda 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.5 1996/07/01 06:52:24 downsj Exp $ */ +/* $OpenBSD: ufs_readwrite.c,v 1.6 1996/07/13 21:49:19 downsj Exp $ */ /* $NetBSD: ufs_readwrite.c,v 1.9 1996/05/11 18:27:57 mycroft Exp $ */ /*- @@ -50,7 +50,7 @@ #define WRITE lfs_write #define WRITE_S "lfs_write" #define fs_bsize lfs_bsize -#define fs_maxfilesize lfs_maxfilesize +#define MAXFILESIZE fs->lfs_maxfilesize #else #ifdef EXT2_READWRITE #define BLKSIZE(a, b, c) blksize(a, b, c) @@ -70,6 +70,7 @@ #define READ_S "ffs_read" #define WRITE ffs_write #define WRITE_S "ffs_write" +#define MAXFILESIZE fs->fs_maxfilesize #endif #endif @@ -116,11 +117,7 @@ READ(v) panic("%s: type %d", READ_S, vp->v_type); #endif fs = ip->I_FS; -#ifdef EXT2_READWRITE if ((u_int64_t)uio->uio_offset > MAXFILESIZE) -#else - if ((u_int64_t)uio->uio_offset > fs->fs_maxfilesize) -#endif return (EFBIG); for (error = 0, bp = NULL; uio->uio_resid > 0; bp = NULL) { @@ -238,11 +235,7 @@ WRITE(v) fs = ip->I_FS; if (uio->uio_offset < 0 || -#ifdef EXT2_READWRITE (u_int64_t)uio->uio_offset + uio->uio_resid > MAXFILESIZE) -#else - (u_int64_t)uio->uio_offset + uio->uio_resid > fs->fs_maxfilesize) -#endif return (EFBIG); /* * Maybe this should be above the vnode op call, but so long as |