Deleted Added
full compact
vfs_extattr.c (186896) vfs_extattr.c (189533)
1/*-
2 * Copyright (c) 1999-2001 Robert N. M. Watson
3 * All rights reserved.
4 *
5 * This software was developed by Robert Watson for the TrustedBSD Project.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

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

22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 */
28
29#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1999-2001 Robert N. M. Watson
3 * All rights reserved.
4 *
5 * This software was developed by Robert Watson for the TrustedBSD Project.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

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

22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 */
28
29#include <sys/cdefs.h>
30__FBSDID("$FreeBSD: head/sys/kern/vfs_extattr.c 186896 2009-01-08 12:47:30Z kib $");
30__FBSDID("$FreeBSD: head/sys/kern/vfs_extattr.c 189533 2009-03-08 12:32:06Z rwatson $");
31
32#include "opt_mac.h"
33
34#include <sys/param.h>
35#include <sys/systm.h>
36#include <sys/lock.h>
37#include <sys/mount.h>
38#include <sys/mutex.h>

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

190 auio.uio_resid = nbytes;
191 auio.uio_rw = UIO_WRITE;
192 auio.uio_segflg = UIO_USERSPACE;
193 auio.uio_td = td;
194 cnt = nbytes;
195
196#ifdef MAC
197 error = mac_vnode_check_setextattr(td->td_ucred, vp, attrnamespace,
31
32#include "opt_mac.h"
33
34#include <sys/param.h>
35#include <sys/systm.h>
36#include <sys/lock.h>
37#include <sys/mount.h>
38#include <sys/mutex.h>

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

190 auio.uio_resid = nbytes;
191 auio.uio_rw = UIO_WRITE;
192 auio.uio_segflg = UIO_USERSPACE;
193 auio.uio_td = td;
194 cnt = nbytes;
195
196#ifdef MAC
197 error = mac_vnode_check_setextattr(td->td_ucred, vp, attrnamespace,
198 attrname, &auio);
198 attrname);
199 if (error)
200 goto done;
201#endif
202
203 error = VOP_SETEXTATTR(vp, attrnamespace, attrname, &auio,
204 td->td_ucred, td);
205 cnt -= auio.uio_resid;
206 td->td_retval[0] = cnt;

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

368 auio.uio_td = td;
369 auiop = &auio;
370 cnt = nbytes;
371 } else
372 sizep = &size;
373
374#ifdef MAC
375 error = mac_vnode_check_getextattr(td->td_ucred, vp, attrnamespace,
199 if (error)
200 goto done;
201#endif
202
203 error = VOP_SETEXTATTR(vp, attrnamespace, attrname, &auio,
204 td->td_ucred, td);
205 cnt -= auio.uio_resid;
206 td->td_retval[0] = cnt;

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

368 auio.uio_td = td;
369 auiop = &auio;
370 cnt = nbytes;
371 } else
372 sizep = &size;
373
374#ifdef MAC
375 error = mac_vnode_check_getextattr(td->td_ucred, vp, attrnamespace,
376 attrname, &auio);
376 attrname);
377 if (error)
378 goto done;
379#endif
380
381 error = VOP_GETEXTATTR(vp, attrnamespace, attrname, auiop, sizep,
382 td->td_ucred, td);
383
384 if (auiop != NULL) {

--- 415 unchanged lines hidden ---
377 if (error)
378 goto done;
379#endif
380
381 error = VOP_GETEXTATTR(vp, attrnamespace, attrname, auiop, sizep,
382 td->td_ucred, td);
383
384 if (auiop != NULL) {

--- 415 unchanged lines hidden ---