Module Name: src Committed By: tls Date: Sun Aug 10 06:54:29 UTC 2014
Modified Files: src/sys/coda [tls-earlyentropy]: coda_psdev.c coda_vfsops.c coda_vnops.c Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.52.2.1 src/sys/coda/coda_psdev.c cvs rdiff -u -r1.80 -r1.80.2.1 src/sys/coda/coda_vfsops.c cvs rdiff -u -r1.96 -r1.96.2.1 src/sys/coda/coda_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/coda/coda_psdev.c diff -u src/sys/coda/coda_psdev.c:1.52 src/sys/coda/coda_psdev.c:1.52.2.1 --- src/sys/coda/coda_psdev.c:1.52 Sun Mar 16 05:20:26 2014 +++ src/sys/coda/coda_psdev.c Sun Aug 10 06:54:29 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: coda_psdev.c,v 1.52 2014/03/16 05:20:26 dholland Exp $ */ +/* $NetBSD: coda_psdev.c,v 1.52.2.1 2014/08/10 06:54:29 tls Exp $ */ /* * @@ -54,7 +54,7 @@ /* These routines are the device entry points for Venus. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: coda_psdev.c,v 1.52 2014/03/16 05:20:26 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: coda_psdev.c,v 1.52.2.1 2014/08/10 06:54:29 tls Exp $"); extern int coda_nc_initialized; /* Set if cache has been initialized */ @@ -121,6 +121,7 @@ const struct cdevsw vcoda_cdevsw = { .d_poll = vc_nb_poll, .d_mmap = nommap, .d_kqfilter = vc_nb_kqfilter, + .d_discard = nodiscard, .d_flag = D_OTHER, }; Index: src/sys/coda/coda_vfsops.c diff -u src/sys/coda/coda_vfsops.c:1.80 src/sys/coda/coda_vfsops.c:1.80.2.1 --- src/sys/coda/coda_vfsops.c:1.80 Sun Mar 23 15:21:15 2014 +++ src/sys/coda/coda_vfsops.c Sun Aug 10 06:54:29 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: coda_vfsops.c,v 1.80 2014/03/23 15:21:15 hannken Exp $ */ +/* $NetBSD: coda_vfsops.c,v 1.80.2.1 2014/08/10 06:54:29 tls Exp $ */ /* * @@ -45,7 +45,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: coda_vfsops.c,v 1.80 2014/03/23 15:21:15 hannken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: coda_vfsops.c,v 1.80.2.1 2014/08/10 06:54:29 tls Exp $"); #ifndef _KERNEL_OPT #define NVCODA 4 @@ -178,6 +178,8 @@ coda_mount(struct mount *vfsp, /* Alloca CodaFid ctlfid = CTL_FID; int error; + if (data == NULL) + return EINVAL; if (vfsp->mnt_flag & MNT_GETARGS) return EINVAL; ENTRY; Index: src/sys/coda/coda_vnops.c diff -u src/sys/coda/coda_vnops.c:1.96 src/sys/coda/coda_vnops.c:1.96.2.1 --- src/sys/coda/coda_vnops.c:1.96 Thu Mar 20 06:48:54 2014 +++ src/sys/coda/coda_vnops.c Sun Aug 10 06:54:29 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: coda_vnops.c,v 1.96 2014/03/20 06:48:54 skrll Exp $ */ +/* $NetBSD: coda_vnops.c,v 1.96.2.1 2014/08/10 06:54:29 tls Exp $ */ /* * @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: coda_vnops.c,v 1.96 2014/03/20 06:48:54 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: coda_vnops.c,v 1.96.2.1 2014/08/10 06:54:29 tls Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -109,6 +109,8 @@ const struct vnodeopv_entry_desc coda_vn { &vop_setattr_desc, coda_setattr }, /* setattr */ { &vop_read_desc, coda_read }, /* read */ { &vop_write_desc, coda_write }, /* write */ + { &vop_fallocate_desc, genfs_eopnotsupp }, /* fallocate */ + { &vop_fdiscard_desc, genfs_eopnotsupp }, /* fdiscard */ { &vop_fcntl_desc, genfs_fcntl }, /* fcntl */ { &vop_ioctl_desc, coda_ioctl }, /* ioctl */ { &vop_mmap_desc, genfs_mmap }, /* mmap */