Deleted Added
full compact
smbfs_io.c (170292) smbfs_io.c (175202)
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 170292 2007-06-04 21:45:18Z attilio $
32 * $FreeBSD: head/sys/fs/smbfs/smbfs_io.c 175202 2008-01-10 01:10:58Z attilio $
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>

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

200 if (uiop->uio_offset < 0)
201 return EINVAL;
202/* if (uiop->uio_offset + uiop->uio_resid > smp->nm_maxfilesize)
203 return EFBIG;*/
204 td = uiop->uio_td;
205 if (vp->v_type == VDIR) {
206 lks = LK_EXCLUSIVE;/*lockstatus(vp->v_vnlock, td);*/
207 if (lks == LK_SHARED)
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>

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

200 if (uiop->uio_offset < 0)
201 return EINVAL;
202/* if (uiop->uio_offset + uiop->uio_resid > smp->nm_maxfilesize)
203 return EFBIG;*/
204 td = uiop->uio_td;
205 if (vp->v_type == VDIR) {
206 lks = LK_EXCLUSIVE;/*lockstatus(vp->v_vnlock, td);*/
207 if (lks == LK_SHARED)
208 vn_lock(vp, LK_UPGRADE | LK_RETRY, td);
208 vn_lock(vp, LK_UPGRADE | LK_RETRY);
209 error = smbfs_readvdir(vp, uiop, cred);
210 if (lks == LK_SHARED)
209 error = smbfs_readvdir(vp, uiop, cred);
210 if (lks == LK_SHARED)
211 vn_lock(vp, LK_DOWNGRADE | LK_RETRY, td);
211 vn_lock(vp, LK_DOWNGRADE | LK_RETRY);
212 return error;
213 }
214
215/* biosize = SSTOCN(smp->sm_share)->sc_txmax;*/
216 if (np->n_flag & NMODIFIED) {
217 smbfs_attr_cacheremove(vp);
218 error = VOP_GETATTR(vp, &vattr, cred, td);
219 if (error)

--- 492 unchanged lines hidden ---
212 return error;
213 }
214
215/* biosize = SSTOCN(smp->sm_share)->sc_txmax;*/
216 if (np->n_flag & NMODIFIED) {
217 smbfs_attr_cacheremove(vp);
218 error = VOP_GETATTR(vp, &vattr, cred, td);
219 if (error)

--- 492 unchanged lines hidden ---