Deleted Added
full compact
smbfs_io.c (128992) smbfs_io.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_io.c 128992 2004-05-06 05:03:23Z alc $
32 * $FreeBSD: head/sys/fs/smbfs/smbfs_io.c 134897 2004-09-07 08:53:28Z phk $
33 *
34 */
35#include <sys/param.h>
36#include <sys/systm.h>
37#include <sys/resourcevar.h> /* defines plimit structure in proc struct */
38#include <sys/kernel.h>
39#include <sys/proc.h>
40#include <sys/fcntl.h>

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

298 }
299 return error;
300}
301
302/*
303 * Do an I/O operation to/from a cache block.
304 */
305int
33 *
34 */
35#include <sys/param.h>
36#include <sys/systm.h>
37#include <sys/resourcevar.h> /* defines plimit structure in proc struct */
38#include <sys/kernel.h>
39#include <sys/proc.h>
40#include <sys/fcntl.h>

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

298 }
299 return error;
300}
301
302/*
303 * Do an I/O operation to/from a cache block.
304 */
305int
306smbfs_doio(struct buf *bp, struct ucred *cr, struct thread *td)
306smbfs_doio(struct vnode *vp, struct buf *bp, struct ucred *cr, struct thread *td)
307{
307{
308 struct vnode *vp = bp->b_vp;
309 struct smbmount *smp = VFSTOSMBFS(vp->v_mount);
310 struct smbnode *np = VTOSMB(vp);
311 struct uio uio, *uiop = &uio;
312 struct iovec io;
313 struct smb_cred scred;
314 int error = 0;
315
316 uiop->uio_iov = &io;

--- 403 unchanged lines hidden ---
308 struct smbmount *smp = VFSTOSMBFS(vp->v_mount);
309 struct smbnode *np = VTOSMB(vp);
310 struct uio uio, *uiop = &uio;
311 struct iovec io;
312 struct smb_cred scred;
313 int error = 0;
314
315 uiop->uio_iov = &io;

--- 403 unchanged lines hidden ---