Date: Sat, 30 May 2009 19:39:59 GMT From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 163113 for review Message-ID: <200905301939.n4UJdxOj006648@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=163113 Change 163113 by trasz@trasz_victim on 2009/05/30 19:39:30 Fix a mismerge and remove calls to vfs_unixify_accmode(9) which are no longer needed. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#27 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_posix1e.c#14 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#33 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#6 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#5 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#27 (text+ko) ==== @@ -3968,27 +3968,20 @@ struct thread *a_td; } */ *ap; { - int error; - accmode_t accmode = ap->a_accmode; - - error = vfs_unixify_accmode(&accmode); - if (error != 0) - return (error); - /* * ZFS itself only knowns about VREAD, VWRITE and VEXEC, the rest * we have to handle by calling vaccess(). */ - if ((accmode & ~(VREAD|VWRITE|VEXEC)) != 0) { + if ((ap->a_accmode & ~(VREAD|VWRITE|VEXEC)) != 0) { vnode_t *vp = ap->a_vp; znode_t *zp = VTOZ(vp); znode_phys_t *zphys = zp->z_phys; return (vaccess(vp->v_type, zphys->zp_mode, zphys->zp_uid, - zphys->zp_gid, accmode, ap->a_cred, NULL)); + zphys->zp_gid, ap->a_accmode, ap->a_cred, NULL)); } - return (zfs_access(ap->a_vp, accmode, 0, ap->a_cred, NULL)); + return (zfs_access(ap->a_vp, ap->a_accmode, 0, ap->a_cred, NULL)); } static int ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_posix1e.c#14 (text+ko) ==== @@ -59,7 +59,7 @@ accmode_t dac_granted; accmode_t priv_granted; accmode_t acl_mask_granted; - int group_matched, i, error; + int group_matched, i; /* * Look for a normal, non-privileged way to access the file/directory @@ -71,10 +71,6 @@ if (privused != NULL) *privused = 0; - error = vfs_unixify_accmode(&accmode); - if (error != 0) - return (error); - /* * Determine privileges now, but don't apply until we've found a DAC * entry that matches but has failed to allow access. ==== //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#33 (text+ko) ==== @@ -3527,7 +3527,6 @@ vaccess(enum vtype type, mode_t file_mode, uid_t file_uid, gid_t file_gid, accmode_t accmode, struct ucred *cred, int *privused) { - int error; accmode_t dac_granted; accmode_t priv_granted; @@ -3541,10 +3540,6 @@ dac_granted = 0; - error = vfs_unixify_accmode(&accmode); - if (error != 0) - return (error); - /* Check the owner. */ if (cred->cr_uid == file_uid) { dac_granted |= VADMIN; @@ -3613,8 +3608,7 @@ !priv_check_cred(cred, PRIV_VFS_READ, 0)) priv_granted |= VREAD; - if ((((accmode & VWRITE) && ((dac_granted & VWRITE) == 0)) || - ((accmode & VAPPEND) && ((dac_granted & VAPPEND) == 0))) && + if ((accmode & VWRITE) && ((dac_granted & VWRITE) == 0) && !priv_check_cred(cred, PRIV_VFS_WRITE, 0)) priv_granted |= (VWRITE | VAPPEND); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: ng_ubt.c,v 1.16 2003/10/10 19:15:06 max Exp $ - * $FreeBSD: head/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c 192984 2009-05-28 17:36:36Z thompsa $ + * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c,v 1.41 2009/05/29 18:46:57 thompsa Exp $ */ /* @@ -238,12 +238,12 @@ ****************************************************************************/ /* USB methods */ -static usb2_callback_t ubt_ctrl_write_callback; -static usb2_callback_t ubt_intr_read_callback; -static usb2_callback_t ubt_bulk_read_callback; -static usb2_callback_t ubt_bulk_write_callback; -static usb2_callback_t ubt_isoc_read_callback; -static usb2_callback_t ubt_isoc_write_callback; +static usb_callback_t ubt_ctrl_write_callback; +static usb_callback_t ubt_intr_read_callback; +static usb_callback_t ubt_bulk_read_callback; +static usb_callback_t ubt_bulk_write_callback; +static usb_callback_t ubt_isoc_read_callback; +static usb_callback_t ubt_isoc_write_callback; static int ubt_fwd_mbuf_up(ubt_softc_p, struct mbuf **); static int ubt_isoc_read_one_frame(struct usb_xfer *, int); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ * SUCH DAMAGE. * * $Id: ubtbcmfw.c,v 1.3 2003/10/10 19:15:08 max Exp $ - * $FreeBSD: head/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c 192984 2009-05-28 17:36:36Z thompsa $ + * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c,v 1.24 2009/05/29 18:46:57 thompsa Exp $ */ #include "usbdevs.h" @@ -79,16 +79,16 @@ static device_attach_t ubtbcmfw_attach; static device_detach_t ubtbcmfw_detach; -static usb2_callback_t ubtbcmfw_write_callback; -static usb2_callback_t ubtbcmfw_read_callback; +static usb_callback_t ubtbcmfw_write_callback; +static usb_callback_t ubtbcmfw_read_callback; -static usb2_fifo_close_t ubtbcmfw_close; -static usb2_fifo_cmd_t ubtbcmfw_start_read; -static usb2_fifo_cmd_t ubtbcmfw_start_write; -static usb2_fifo_cmd_t ubtbcmfw_stop_read; -static usb2_fifo_cmd_t ubtbcmfw_stop_write; -static usb2_fifo_ioctl_t ubtbcmfw_ioctl; -static usb2_fifo_open_t ubtbcmfw_open; +static usb_fifo_close_t ubtbcmfw_close; +static usb_fifo_cmd_t ubtbcmfw_start_read; +static usb_fifo_cmd_t ubtbcmfw_start_write; +static usb_fifo_cmd_t ubtbcmfw_stop_read; +static usb_fifo_cmd_t ubtbcmfw_stop_write; +static usb_fifo_ioctl_t ubtbcmfw_ioctl; +static usb_fifo_open_t ubtbcmfw_open; static struct usb_fifo_methods ubtbcmfw_fifo_methods = {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905301939.n4UJdxOj006648>