ffs_vnops.c (105422) | ffs_vnops.c (109623) |
---|---|
1/* 2 * Copyright (c) 2002 Networks Associates Technology, Inc. 3 * All rights reserved. 4 * 5 * This software was developed for the FreeBSD Project by Marshall 6 * Kirk McKusick and Network Associates Laboratories, the Security 7 * Research Division of Network Associates, Inc. under DARPA/SPAWAR 8 * contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS --- 26 unchanged lines hidden (view full) --- 35 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 36 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 37 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 38 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 39 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 40 * SUCH DAMAGE. 41 * 42 * @(#)ffs_vnops.c 8.15 (Berkeley) 5/14/95 | 1/* 2 * Copyright (c) 2002 Networks Associates Technology, Inc. 3 * All rights reserved. 4 * 5 * This software was developed for the FreeBSD Project by Marshall 6 * Kirk McKusick and Network Associates Laboratories, the Security 7 * Research Division of Network Associates, Inc. under DARPA/SPAWAR 8 * contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS --- 26 unchanged lines hidden (view full) --- 35 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 36 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 37 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 38 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 39 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 40 * SUCH DAMAGE. 41 * 42 * @(#)ffs_vnops.c 8.15 (Berkeley) 5/14/95 |
43 * $FreeBSD: head/sys/ufs/ffs/ffs_vnops.c 105422 2002-10-18 22:52:41Z dillon $ | 43 * $FreeBSD: head/sys/ufs/ffs/ffs_vnops.c 109623 2003-01-21 08:56:16Z alfred $ |
44 */ 45 46#include <sys/param.h> 47#include <sys/bio.h> 48#include <sys/systm.h> 49#include <sys/buf.h> 50#include <sys/conf.h> 51#include <sys/extattr.h> --- 1325 unchanged lines hidden (view full) --- 1377 int easize, error; 1378 u_char *eae; 1379 1380 ip = VTOI(vp); 1381 fs = ip->i_fs; 1382 dp = ip->i_din2; 1383 easize = dp->di_extsize; 1384 | 44 */ 45 46#include <sys/param.h> 47#include <sys/bio.h> 48#include <sys/systm.h> 49#include <sys/buf.h> 50#include <sys/conf.h> 51#include <sys/extattr.h> --- 1325 unchanged lines hidden (view full) --- 1377 int easize, error; 1378 u_char *eae; 1379 1380 ip = VTOI(vp); 1381 fs = ip->i_fs; 1382 dp = ip->i_din2; 1383 easize = dp->di_extsize; 1384 |
1385 eae = malloc(easize + extra, M_TEMP, M_WAITOK); | 1385 eae = malloc(easize + extra, M_TEMP, 0); |
1386 1387 liovec.iov_base = eae; 1388 liovec.iov_len = easize; 1389 luio.uio_iov = &liovec; 1390 luio.uio_iovcnt = 1; 1391 luio.uio_offset = 0; 1392 luio.uio_resid = easize; 1393 luio.uio_segflg = UIO_SYSSPACE; --- 308 unchanged lines hidden (view full) --- 1702 eapad1 = 0; 1703 eacont = ealength + eapad1; 1704 eapad2 = 8 - (ealen % 8); 1705 if (eapad2 == 8) 1706 eapad2 = 0; 1707 ealength += eapad1 + ealen + eapad2; 1708 } 1709 | 1386 1387 liovec.iov_base = eae; 1388 liovec.iov_len = easize; 1389 luio.uio_iov = &liovec; 1390 luio.uio_iovcnt = 1; 1391 luio.uio_offset = 0; 1392 luio.uio_resid = easize; 1393 luio.uio_segflg = UIO_SYSSPACE; --- 308 unchanged lines hidden (view full) --- 1702 eapad1 = 0; 1703 eacont = ealength + eapad1; 1704 eapad2 = 8 - (ealen % 8); 1705 if (eapad2 == 8) 1706 eapad2 = 0; 1707 ealength += eapad1 + ealen + eapad2; 1708 } 1709 |
1710 eae = malloc(ip->i_ea_len + ealength, M_TEMP, M_WAITOK); | 1710 eae = malloc(ip->i_ea_len + ealength, M_TEMP, 0); |
1711 bcopy(ip->i_ea_area, eae, ip->i_ea_len); 1712 easize = ip->i_ea_len; 1713 1714 olen = ffs_findextattr(eae, easize, 1715 ap->a_attrnamespace, ap->a_name, &p, NULL); 1716 if (olen == -1 && ealength == 0) { 1717 /* delete but nonexistent */ 1718 free(eae, M_TEMP); --- 54 unchanged lines hidden --- | 1711 bcopy(ip->i_ea_area, eae, ip->i_ea_len); 1712 easize = ip->i_ea_len; 1713 1714 olen = ffs_findextattr(eae, easize, 1715 ap->a_attrnamespace, ap->a_name, &p, NULL); 1716 if (olen == -1 && ealength == 0) { 1717 /* delete but nonexistent */ 1718 free(eae, M_TEMP); --- 54 unchanged lines hidden --- |