Deleted Added
full compact
smbfs_vnops.c (132653) smbfs_vnops.c (134897)
1/*
2 * Copyright (c) 2000-2001 Boris Popov
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 15 unchanged lines hidden (view full) ---

24 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 *
1/*
2 * Copyright (c) 2000-2001 Boris Popov
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 15 unchanged lines hidden (view full) ---

24 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 *
32 * $FreeBSD: head/sys/fs/smbfs/smbfs_vnops.c 132653 2004-07-26 07:24:04Z cperciva $
32 * $FreeBSD: head/sys/fs/smbfs/smbfs_vnops.c 134897 2004-09-07 08:53:28Z phk $
33 */
34#include <sys/param.h>
35#include <sys/systm.h>
36#include <sys/namei.h>
37#include <sys/kernel.h>
38#include <sys/proc.h>
39#include <sys/bio.h>
40#include <sys/buf.h>

--- 808 unchanged lines hidden (view full) ---

849 struct buf *a_bp
850 } */ *ap;
851{
852 struct buf *bp=ap->a_bp;
853 struct ucred *cr;
854 struct thread *td;
855 int error = 0;
856
33 */
34#include <sys/param.h>
35#include <sys/systm.h>
36#include <sys/namei.h>
37#include <sys/kernel.h>
38#include <sys/proc.h>
39#include <sys/bio.h>
40#include <sys/buf.h>

--- 808 unchanged lines hidden (view full) ---

849 struct buf *a_bp
850 } */ *ap;
851{
852 struct buf *bp=ap->a_bp;
853 struct ucred *cr;
854 struct thread *td;
855 int error = 0;
856
857 KASSERT(ap->a_vp == ap->a_bp->b_vp, ("%s(%p != %p)",
858 __func__, ap->a_vp, ap->a_bp->b_vp));
859 SMBVDEBUG("\n");
860 if (bp->b_flags & B_ASYNC)
861 td = (struct thread *)0;
862 else
863 td = curthread; /* XXX */
864 if (bp->b_iocmd == BIO_READ)
865 cr = bp->b_rcred;
866 else
867 cr = bp->b_wcred;
868
869 if ((bp->b_flags & B_ASYNC) == 0 )
857 SMBVDEBUG("\n");
858 if (bp->b_flags & B_ASYNC)
859 td = (struct thread *)0;
860 else
861 td = curthread; /* XXX */
862 if (bp->b_iocmd == BIO_READ)
863 cr = bp->b_rcred;
864 else
865 cr = bp->b_wcred;
866
867 if ((bp->b_flags & B_ASYNC) == 0 )
870 error = smbfs_doio(bp, cr, td);
868 error = smbfs_doio(ap->a_vp, bp, cr, td);
871 return error;
872}
873
874int
875smbfs_ioctl(ap)
876 struct vop_ioctl_args /* {
877 struct vnode *a_vp;
878 u_long a_command;

--- 448 unchanged lines hidden ---
869 return error;
870}
871
872int
873smbfs_ioctl(ap)
874 struct vop_ioctl_args /* {
875 struct vnode *a_vp;
876 u_long a_command;

--- 448 unchanged lines hidden ---