Date: Thu, 27 Jun 2002 14:03:49 -0700 (PDT) From: Julian Elischer <julian@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 13496 for review Message-ID: <200206272103.g5RL3ngk022836@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13496 Change 13496 by julian@julian_ref on 2002/06/27 14:03:30 MFC to see if it fixes anything.. Affected files ... .. //depot/projects/kse/sys/kern/kern_acl.c#16 integrate .. //depot/projects/kse/sys/pccard/pcic_pci.c#26 integrate Differences ... ==== //depot/projects/kse/sys/kern/kern_acl.c#16 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_acl.c,v 1.28 2002/06/13 23:17:39 rwatson Exp $ + * $FreeBSD: src/sys/kern/kern_acl.c,v 1.30 2002/06/27 19:31:15 rwatson Exp $ */ /* * Developed by the TrustedBSD Project. @@ -50,12 +50,12 @@ MALLOC_DEFINE(M_ACL, "acl", "access control list"); -static int vacl_set_acl(struct thread *td, struct vnode *vp, acl_type_t type, - struct acl *aclp); -static int vacl_get_acl(struct thread *td, struct vnode *vp, acl_type_t type, - struct acl *aclp); +static int vacl_set_acl(struct thread *td, struct vnode *vp, + acl_type_t type, struct acl *aclp); +static int vacl_get_acl(struct thread *td, struct vnode *vp, + acl_type_t type, struct acl *aclp); static int vacl_aclcheck(struct thread *td, struct vnode *vp, - acl_type_t type, struct acl *aclp); + acl_type_t type, struct acl *aclp); /* * Implement a version of vaccess() that understands POSIX.1e ACL semantics. @@ -621,7 +621,7 @@ return (error); VOP_LEASE(vp, td, td->td_ucred, LEASE_WRITE); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, td); - error = VOP_SETACL(vp, ACL_TYPE_DEFAULT, 0, td->td_ucred, td); + error = VOP_SETACL(vp, type, NULL, td->td_ucred, td); VOP_UNLOCK(vp, 0, td); vn_finished_write(mp); return (error); ==== //depot/projects/kse/sys/pccard/pcic_pci.c#26 (text+ko) ==== @@ -26,7 +26,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. * - * $FreeBSD: src/sys/pccard/pcic_pci.c,v 1.112 2002/06/23 01:55:10 imp Exp $ + * $FreeBSD: src/sys/pccard/pcic_pci.c,v 1.115 2002/06/27 19:56:22 imp Exp $ */ #include <sys/param.h> @@ -435,7 +435,7 @@ { /* * The 68xx datasheets make it hard to know what the right thing - * do do here is. We do hwat we knjow, which is nothing, and + * to do here is. We do what we know, which is nothing, and * hope for the best. */ /* XXX */ @@ -1338,7 +1338,7 @@ pci_write_config(dev, sc->memrid, 0xffffffff, 4); sockbase = pci_read_config(dev, sc->memrid, 4); sockbase = (sockbase & 0xfffffff0) & -(sockbase & 0xfffffff0); -#define CARDBUS_SYS_RES_MEMORY_START 0x44000000 +#define CARDBUS_SYS_RES_MEMORY_START 0x88000000 #define CARDBUS_SYS_RES_MEMORY_END 0xFFFFFFFF sc->memres = bus_generic_alloc_resource(device_get_parent(dev), dev, SYS_RES_MEMORY, &sc->memrid, To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200206272103.g5RL3ngk022836>