diff options
| author | dfr <dfr@FreeBSD.org> | 1997-04-06 10:10:50 +0000 |
|---|---|---|
| committer | dfr <dfr@FreeBSD.org> | 1997-04-06 10:10:50 +0000 |
| commit | 6b27cec2a9f16e020db3f190354d5b1aa1f391fc (patch) | |
| tree | 9e61843ffff3422f4507283a437227e2736b804e | |
| parent | f304c6bda9fc83454f09113fd380f2516a41ec9e (diff) | |
| download | FreeBSD-src-6b27cec2a9f16e020db3f190354d5b1aa1f391fc.zip FreeBSD-src-6b27cec2a9f16e020db3f190354d5b1aa1f391fc.tar.gz | |
Remove dependancy on UFS' DIRBLKSIZ definition.
2.2 candidate.
Submitted by: bde
| -rw-r--r-- | sys/compat/linux/linux_file.c | 8 | ||||
| -rw-r--r-- | sys/i386/linux/linux_file.c | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index e6e71e9..3c5984a 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: linux_file.c,v 1.12 1997/03/24 11:24:29 bde Exp $ + * $Id: linux_file.c,v 1.13 1997/04/05 14:50:56 dfr Exp $ */ #include <sys/param.h> @@ -35,17 +35,12 @@ #include <sys/file.h> #include <sys/filedesc.h> #include <sys/proc.h> -#include <sys/stat.h> #include <sys/vnode.h> #include <sys/malloc.h> -#include <sys/exec.h> #include <sys/dirent.h> -#include <sys/sysproto.h> #include <sys/conf.h> #include <sys/tty.h> -#include <ufs/ufs/dir.h> - #include <i386/linux/linux.h> #include <i386/linux/linux_proto.h> #include <i386/linux/linux_util.h> @@ -447,6 +442,7 @@ linux_getdents(struct proc *p, struct linux_getdents_args *args, int *retval) justone = 0; off = fp->f_offset; +#define DIRBLKSIZ 512 /* XXX we used to use ufs's DIRBLKSIZ */ buflen = max(DIRBLKSIZ, nbytes); buflen = min(buflen, MAXBSIZE); buf = malloc(buflen, M_TEMP, M_WAITOK); diff --git a/sys/i386/linux/linux_file.c b/sys/i386/linux/linux_file.c index e6e71e9..3c5984a 100644 --- a/sys/i386/linux/linux_file.c +++ b/sys/i386/linux/linux_file.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: linux_file.c,v 1.12 1997/03/24 11:24:29 bde Exp $ + * $Id: linux_file.c,v 1.13 1997/04/05 14:50:56 dfr Exp $ */ #include <sys/param.h> @@ -35,17 +35,12 @@ #include <sys/file.h> #include <sys/filedesc.h> #include <sys/proc.h> -#include <sys/stat.h> #include <sys/vnode.h> #include <sys/malloc.h> -#include <sys/exec.h> #include <sys/dirent.h> -#include <sys/sysproto.h> #include <sys/conf.h> #include <sys/tty.h> -#include <ufs/ufs/dir.h> - #include <i386/linux/linux.h> #include <i386/linux/linux_proto.h> #include <i386/linux/linux_util.h> @@ -447,6 +442,7 @@ linux_getdents(struct proc *p, struct linux_getdents_args *args, int *retval) justone = 0; off = fp->f_offset; +#define DIRBLKSIZ 512 /* XXX we used to use ufs's DIRBLKSIZ */ buflen = max(DIRBLKSIZ, nbytes); buflen = min(buflen, MAXBSIZE); buf = malloc(buflen, M_TEMP, M_WAITOK); |
